Skip to content

fix(stream): 流中断时干净收尾，避免拼接错乱回复 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sunsh1neY wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

fix(stream): 流中断时干净收尾，避免拼接错乱回复 #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion gemini_web2api/gemini.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ def _get_httpx_client():
if _httpx_client is None and HAS_HTTPX:
proxy = CONFIG.get("proxy")
transport = httpx.HTTPTransport(proxy=proxy) if proxy else None
_httpx_client = httpx.Client(transport=transport, timeout=CONFIG["request_timeout_sec"], verify=True)
# Connection: close disables keep-alive reuse — the proxy/upstream kills
# idle connections, and reusing a dead one fails mid-stream with
# "[SSL] record layer failure", which corrupts streaming responses.
_httpx_client = httpx.Client(transport=transport, timeout=CONFIG["request_timeout_sec"], verify=True,
headers={"Connection": "close"})
return _httpx_client


Expand Down Expand Up @@ -273,6 +277,12 @@ def generate_stream(prompt: str, model_id: int, think_mode: int, file_refs: list
yield delta
return
except Exception as e:
if emitted_raw_text:
# Partial content already streamed: a retry would either fail the
# prefix check or splice two different generations together, so end
# the stream cleanly and let the client ask to continue.
log(f"Stream interrupted after partial output ({len(emitted_raw_text)} chars), ending cleanly: {e}")
return
last_err = e
if attempt < CONFIG["retry_attempts"] - 1:
log(f"Stream retry {attempt+1}/{CONFIG['retry_attempts']}: {e}")
Expand Down