fix(provider): add proxy support for rerank providers - #9384
Open
GuJi08233 wants to merge 1 commit into
Open
Conversation
Rerank providers use aiohttp.ClientSession without proxy configuration, causing requests to bypass the configured proxy. Add proxy field to vLLM, Bailian, NVIDIA, and TEI rerank provider configs and pass it to each aiohttp request call. Fixes AstrBotDevs#9383
Contributor
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
Contributor
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- Proxy handling is now duplicated across multiple rerank sources; consider centralizing proxy retrieval and request configuration in a shared helper or base class to keep behavior consistent and reduce repetition.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Proxy handling is now duplicated across multiple rerank sources; consider centralizing proxy retrieval and request configuration in a shared helper or base class to keep behavior consistent and reduce repetition.Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #9383
Rerank 提供商使用
aiohttp.ClientSession发起 HTTP 请求,但创建时未传入代理参数,也未设置trust_env=True,导致配置了代理的用户无法通过代理访问外部 Rerank API(请求超时或仅能直连)。本次修复为 4 个 aiohttp-based Rerank 提供商添加了与其他提供商一致的
proxy配置支持。Modifications / 改动点
astrbot/core/config/default.py— 为 vLLM、百炼、NVIDIA、TEI 四个 Rerank 提供商配置模板添加"proxy": ""字段astrbot/core/provider/sources/vllm_rerank_source.py— 读取 proxy 配置并传入session.post(proxy=...)astrbot/core/provider/sources/bailian_rerank_source.py— 同上astrbot/core/provider/sources/nvidia_rerank_source.py— 同上astrbot/core/provider/sources/tei_rerank_source.py— 同上,包括test()方法中的 GET 请求Screenshots or Test Results / 运行截图或测试结果
代码变更量极小(每个文件 +2 行),仅在
__init__中读取 proxy 配置,在请求调用中传递 proxy 参数,不改变任何现有行为。Checklist / 检查清单
😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
/ 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。
👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
/ 我的更改经过了良好的测试,并已在上方提供了"验证步骤"和"运行截图"。
🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in
requirements.txtandpyproject.toml./ 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到
requirements.txt和pyproject.toml文件相应位置。😮 My changes do not introduce malicious code.
/ 我的更改没有引入恶意代码。
Summary by Sourcery
Add proxy configuration support to aiohttp-based rerank providers to allow external rerank APIs to be accessed via user-configured proxies.
Bug Fixes:
Enhancements: