"fix_retry_timeout_for_cloudflare_524"

app/server/chat.py

@@ -786,7 +786,7 @@ async def _send_with_split(
         content: str, file_list: list | None
     ) -> AsyncGenerator[ModelOutput, None]:
         """Manual retry logic for streaming."""
-        max_retries = 2 # Increased from 1
+        max_retries = 1 # 再次减少到 1 次，确保总时长可控
         for attempt in range(max_retries + 1):
             try:
                 gen = session.send_message_stream(content, files=file_list)
@@ -797,29 +797,26 @@ async def _send_with_split(
                 return
             except Exception as e:
                 if has_yielded:
-                    # If we already started yielding data, we can't easily retry the stream
-                    # without sending duplicate content to the client.
                     logger.error(f"Stream interrupted after yielding data: {e}")
                     raise e
                 
                 error_str = str(e).lower()
-                # Safety check: Do not retry if error indicates auth failure or rate limit
                 if any(code in error_str for code in ["429", "403", "401", "quota"]):
                     raise e
 
                 if attempt < max_retries:
-                    delay = (attempt + 1) * 3.0 + random.uniform(0.5, 1.5)
+                    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:
                     raise e
 
     @retry_with_backoff(
-        max_retries=3,
+        max_retries=1, # 减少重试次数，避免触发 Cloudflare 524 超时
         base_delay=2.0,
-        max_delay=30.0,
+        max_delay=10.0,
         exponential_base=2.0,
-        retryable_exceptions=(ConnectionError, TimeoutError, OSError, Exception), # Catch all for APIError
+        retryable_exceptions=(ConnectionError, TimeoutError, OSError, Exception),
     )
     async def _send_with_retry(
         content: str, file_list: list | None, is_stream: bool
@@ -830,11 +827,11 @@ async def _send_with_split(
                 return _stream_with_retry(content, file_list)
             return await session.send_message(content, files=file_list)
         except Exception as e:
-            # If it's a known "Stream interrupted" error, we want to retry
             error_msg = str(e)
+            # 如果是流中断，记录警告并抛出以触发重试
             if "Stream interrupted" in error_msg or "truncated" in error_msg:
-                logger.warning(f"Gemini stream interrupted, triggering retry: {e}")
-                raise e # Let decorator handle retry
+                logger.warning(f"Gemini stream interrupted (Session: {session.sid}): {e}")
+                raise e
             raise e
     
     if len(text) <= MAX_CHARS_PER_REQUEST: