"fix_deep_stream_interrupted_and_timeout"

app/frontend/script.js

@@ -410,7 +410,14 @@ async function sendMessage() {
             signal: signal
         });
 
-        if (!response.ok) throw new Error(`API 请求失败: ${response.status}`);
+        if (!response.ok) {
+            if (response.status === 502 || response.status === 504) {
+                throw new Error('上游服务(Gemini)响应超时或连接中断，请稍后重试或更换图片。');
+            } else if (response.status === 503) {
+                throw new Error('服务器当前繁忙，请稍后重试。');
+            }
+            throw new Error(`API 请求失败: ${response.status}`);
+        }
 
         // 如果检测到画图意图，使用非流式处理
         if (autoDetectDraw) {

app/server/chat.py

@@ -805,7 +805,13 @@ async def _send_with_split(
                     raise e
 
                 if attempt < max_retries:
-                    delay = 2.0 + random.uniform(0.1, 0.5) # 缩短延迟
+                    # 如果是流中断，给予更长的冷却时间让上游恢复
+                    if "interrupted" in error_str or "truncated" in error_str:
+                        delay = 5.0 + random.uniform(1.0, 3.0)
+                        logger.warning(f"Stream interrupted. Cooling down for {delay:.2f}s before retry...")
+                    else:
+                        delay = 2.0 + random.uniform(0.1, 0.5)
+                        
                     logger.warning(f"Stream failed to start (attempt {attempt+1}/{max_retries}). Retrying in {delay:.2f}s. Error: {e}")
                     await asyncio.sleep(delay)
                 else:

app/services/client.py

@@ -136,9 +136,8 @@ class GeminiClientWrapper(GeminiClient):
             "auto_refresh": auto_refresh,
             "refresh_interval": refresh_interval,
             "verbose": verbose,
+            "watchdog_timeout": 120.0 if watchdog_timeout is _UNSET else watchdog_timeout, # 增加看门狗超时
         }
-        if watchdog_timeout is not _UNSET:
-            call_kwargs["watchdog_timeout"] = watchdog_timeout
         if kwargs:
             call_kwargs.update(kwargs)
 

config/config.yaml

@@ -22,7 +22,7 @@ gemini:
       secure_1psid: "g.a0006ghLMuTMAgxpLCPEErGijJmoYdaeoQ8jQvccH014n1gYV_A6_9K7SUzPUYqsFZYeKCFj0QACgYKAe8SARcSFQHGX2MiQREdDmeRiaB-meb6rxWh1RoVAUF8yKqKLXLomJGmcEm899BsY1K90076"
       secure_1psidts: "sidts-CjEB7I_69ImkFO--6ZoqrN9V6ThAw-I__6wzxDni5ELJR7Ia4najVtYeQCmjpk01XH0yEAA"
       proxy: null          # Optional proxy URL (null/empty means direct connection)
-  timeout: 120             # Init timeout in seconds
+  timeout: 300             # Init timeout in seconds (increased for stability)
   auto_refresh: true       # Auto-refresh session cookies
   refresh_interval: 3600    # Refresh interval in seconds
   verbose: false           # Enable verbose logging for Gemini requests

requirements.txt

@@ -1,5 +1,5 @@
 fastapi>=0.128.0
-gemini-webapi>=1.18.0
+gemini-webapi>=1.20.0
 lmdb>=1.7.5
 loguru>=0.7.3
 orjson>=3.11.7