From 34fa65132d8b13e651b668093faf6d210a74477a Mon Sep 17 00:00:00 2001
From: aileenfun <alanliu0618@gmail.com>
Date: Tue, 18 Mar 2025 21:04:21 +0800
Subject: [PATCH] =?UTF-8?q?gemini=E7=8B=AC=E7=AB=8B=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20=E5=9C=A8=E4=BB=A3=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E6=89=8B=E5=8A=A8=E7=BB=84=E6=88=90request?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E8=AE=BA=20Steam=20=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E4=B8=BA=20True=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=9A=84=E5=9D=87?=
 =?UTF-8?q?=E6=98=AF=E9=9D=9Esteam=E5=80=BC=E3=80=82=20=E4=B8=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=90=86=E6=97=B6=E8=87=AA=E5=8A=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BAgoogle=E7=9A=84=E5=AE=98=E6=96=B9api=EF=BC=8C?=
 =?UTF-8?q?=E8=B5=B0=20stream=E6=A8=A1=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

全局代理容易让系统中其他模块也使用代理，造成无法访问的问题。
测试最新的 gemini flash 2.0可以使用。
---
 .../core/providers/llm/gemini/gemini.py       | 52 ++++++++++++++-----
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/main/xiaozhi-server/core/providers/llm/gemini/gemini.py b/main/xiaozhi-server/core/providers/llm/gemini/gemini.py
index e559bd8e..298bf71e 100644
--- a/main/xiaozhi-server/core/providers/llm/gemini/gemini.py
+++ b/main/xiaozhi-server/core/providers/llm/gemini/gemini.py
@@ -85,22 +85,48 @@ class LLMProvider(LLMProviderBase):
                 "Content-Type": "application/json",
             }
 
-            # 发送POST请求,经测试手动 request 无法使用 stream 模式，但是文本消息其实也很快，stream 与否也无所谓
+            # 发送POST请求,经测试手动 request 无法使用 stream 模式
             if self.proxies:
+                logger.bind(tag=TAG).info(f"Gemini response mode ")
                 response = requests.post(url, headers=headers, json=request_body, stream=False, proxies=self.proxies)
+                try:
+                    data = response.json()  # 直接解析JSON
+                    if 'candidates' in data and data['candidates']:
+                        yield data['candidates'][0]['content']['parts'][0]['text']
+                    else:
+                        yield "未找到候选回复。"
+                except json.JSONDecodeError as e:
+                    yield f"JSON解码错误：{e}"
+                except Exception as e:
+                    yield f"发生错误：{e}"
             else:
-                response = requests.post(url, headers=headers, json=request_body, stream=False)
-            response.raise_for_status()
-            try:
-                data = response.json()  # 直接解析JSON
-                if 'candidates' in data and data['candidates']:
-                    yield data['candidates'][0]['content']['parts'][0]['text']
-                else:
-                    yield "未找到候选回复。"
-            except json.JSONDecodeError as e:
-                yield f"JSON解码错误：{e}"
-            except Exception as e:
-                yield f"发生错误：{e}"
+                logger.bind(tag=TAG).info(f"Gemini stream mode ")
+                chat = self.model.start_chat(history=chat_history)
+
+                # 发送消息并获取流式响应
+                response = chat.send_message(
+                    current_msg,
+                    stream=True,
+                    generation_config=self.generation_config
+                )
+                # 处理流式响应
+                for chunk in response:
+                    if hasattr(chunk, 'text') and chunk.text:
+                        yield chunk.text
+
+        except Exception as e:
+            error_msg = str(e)
+            logger.bind(tag=TAG).error(f"Gemini响应生成错误: {error_msg}")
+
+            # 针对不同错误返回友好提示
+            if "Rate limit" in error_msg:
+                yield "【Gemini服务请求太频繁,请稍后再试】"
+            elif "Invalid API key" in error_msg:
+                yield "【Gemini API key无效】"
+            else:
+                yield f"【Gemini服务响应异常: {error_msg}】"
+
+
 
 
         except requests.exceptions.RequestException as e: