GithubBackup/gemini-balance
1
0
Fork 0
mirror of https://github.com/snailyp/gemini-balance.git synced 2026-09-06 16:16:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 Gemini 模型工具和流式请求错误处理

Browse Source
This commit is contained in:
yinpeng
2024-12-20 10:26:16 +08:00
parent 8dfe617468
commit c8124d5d32
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/chat_service.py
+4 -3
View File
@@ -142,7 +142,7 @@ class ChatService:
if tools is None: if tools is None:
tools = [] tools = []
if settings.TOOLS_CODE_EXECUTION_ENABLED and not model.endswith("-search"): if settings.TOOLS_CODE_EXECUTION_ENABLED and not (model.endswith("-search") or "-thinking" in model):
tools.append({"code_execution": {}}) tools.append({"code_execution": {}})
if model.endswith("-search"): if model.endswith("-search"):
tools.append({"googleSearch": {}}) tools.append({"googleSearch": {}})
@@ -198,9 +198,10 @@ class ChatService:
timeout = httpx.Timeout(60.0, read=60.0) # 连接超时60秒，读取超时60秒 timeout = httpx.Timeout(60.0, read=60.0) # 连接超时60秒，读取超时60秒
async with httpx.AsyncClient(timeout=timeout) as client: async with httpx.AsyncClient(timeout=timeout) as client:
stream_url = f"https://generativelanguage.googleapis.com/v1beta/models/{gemini_model}:streamGenerateContent?alt=sse&key={current_api_key}" stream_url = f"https://generativelanguage.googleapis.com/v1beta/models/{gemini_model}:streamGenerateContent?alt=sse&key={current_api_key}"
async with client.stream("POST", stream_url, json=payload) as response: async with client.stream('POST', stream_url, json=payload) as response:
if response.status_code != 200: if response.status_code != 200:
error_msg = await response.text() error_content = await response.read()
error_msg = error_content.decode('utf-8')
logger.error(f"API error: {response.status_code}, {error_msg}") logger.error(f"API error: {response.status_code}, {error_msg}")
if retries < MAX_RETRIES - 1: if retries < MAX_RETRIES - 1:
current_api_key = await self.key_manager.handle_api_failure(current_api_key) current_api_key = await self.key_manager.handle_api_failure(current_api_key)