From 145c5b37a47cb411ca17b1790e8fba2c8da5e1e7 Mon Sep 17 00:00:00 2001 From: yzchen Date: Tue, 30 Sep 2025 09:38:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Gemini=E4=BB=A3=E7=90=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BD=BF=E7=94=A8REST=E4=BC=A0=E8=BE=93=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DgRPC=E4=B8=8D=E6=94=AF=E6=8C=81=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/xiaozhi-server/core/providers/llm/gemini/gemini.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main/xiaozhi-server/core/providers/llm/gemini/gemini.py b/main/xiaozhi-server/core/providers/llm/gemini/gemini.py index 0b996882bf..56998fd9bd 100644 --- a/main/xiaozhi-server/core/providers/llm/gemini/gemini.py +++ b/main/xiaozhi-server/core/providers/llm/gemini/gemini.py @@ -77,6 +77,7 @@ def __init__(self, cfg: Dict[str, Any]): if model_key_msg: log.bind(tag=TAG).error(model_key_msg) + use_proxy = False if http_proxy or https_proxy: log.bind(tag=TAG).info( f"检测到Gemini代理配置，开始测试代理连通性和设置代理环境..." @@ -85,8 +86,12 @@ def __init__(self, cfg: Dict[str, Any]): log.bind(tag=TAG).info( f"Gemini 代理设置成功 - HTTP: {http_proxy}, HTTPS: {https_proxy}" ) + use_proxy = True # 配置API密钥 - genai.configure(api_key=self.api_key) + if use_proxy: + genai.configure(api_key=self.api_key, transport="rest") + else: + genai.configure(api_key=self.api_key) # 设置请求超时（秒） self.timeout = cfg.get("timeout", 120) # 默认120秒