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

feat: 优化 Gemini 模型思考过程展示逻辑

Browse Source
This commit is contained in:
yinpeng
2024-12-25 00:36:32 +08:00
parent 5a1c3bdbe7
commit 9d5a99583d
2 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core/config.py
+2 -1
View File
@@ -9,7 +9,8 @@ class Settings(BaseSettings):
MODEL_SEARCH: List[str] = ["gemini-2.0-flash-exp"] MODEL_SEARCH: List[str] = ["gemini-2.0-flash-exp"]
TOOLS_CODE_EXECUTION_ENABLED: bool = False TOOLS_CODE_EXECUTION_ENABLED: bool = False
SHOW_SEARCH_LINK: bool = True SHOW_SEARCH_LINK: bool = True
SHOW_THINKING_PROCESS: bool = True
class Config: class Config:
env_file = ".env" env_file = ".env"
app/services/chat_service.py
+52 -30
View File
@@ -72,6 +72,7 @@ class ChatService:
self.base_url = base_url self.base_url = base_url
self.key_manager = key_manager self.key_manager = key_manager
self.thinking_first = True self.thinking_first = True
self.thinking_status = False
def convert_gemini_response_to_openai( def convert_gemini_response_to_openai(
self, self,
@@ -90,31 +91,49 @@ class ChatService:
parts = content.get("parts", []) parts = content.get("parts", [])
if "thinking" in model: if "thinking" in model:
if len(parts) == 1: if settings.SHOW_THINKING_PROCESS:
if self.thinking_first: if len(parts) == 1:
self.thinking_first = False if self.thinking_first:
text = "\n🤔 **思考过程** 🤔\n---\n```\n" + parts[ self.thinking_first = False
0 self.thinking_status = True
].get("text") text = "【思考过程】\n\n" + parts[0].get("text")
else: else:
text = parts[0].get("text") text = parts[0].get("text")
elif len(parts) == 2:
if self.thinking_first: if len(parts) == 2:
self.thinking_first = False self.thinking_status = False
text = ( if self.thinking_first:
"\n🤔 **思考过程** 🤔\n---\n```\n" self.thinking_first = False
+ parts[0].get("text") text = (
+ "\n```\n---\n" "【思考过程】\n\n"
+ parts[1].get("text") + parts[0].get("text")
) + "\n---\n【输出结果】\n\n"
else: + parts[1].get("text")
text = ( )
parts[0].get("text") else:
+ "\n```\n---\n" text = (
+ parts[1].get("text") parts[0].get("text")
) + "\n---\n【输出结果】\n\n"
+ parts[1].get("text")
)
else: else:
text = "" if len(parts) == 1:
if self.thinking_first:
self.thinking_first = False
self.thinking_status = True
text = ""
elif self.thinking_status:
text = ""
else:
text = parts[0].get("text")
if len(parts) == 2:
self.thinking_status = False
if self.thinking_first:
self.thinking_first = False
text = parts[1].get("text")
else:
text = parts[1].get("text")
else: else:
if "text" in parts[0]: if "text" in parts[0]:
text = parts[0].get("text") text = parts[0].get("text")
@@ -180,12 +199,15 @@ class ChatService:
if response.get("candidates"): if response.get("candidates"):
candidate = response["candidates"][0] candidate = response["candidates"][0]
if "thinking" in model: if "thinking" in model:
text = ( if settings.SHOW_THINKING_PROCESS:
"\n🤔 **思考过程** 🤔\n---\n```\n" text = (
+ candidate["content"]["parts"][0]["text"] "【思考过程】\n\n"
+ "\n```\n---\n" + candidate["content"]["parts"][0]["text"]
+ candidate["content"]["parts"][1]["text"] + "\n---\n【输出结果】\n\n"
) + candidate["content"]["parts"][1]["text"]
)
else:
text = candidate["content"]["parts"][1]["text"]
else: else:
text = candidate["content"]["parts"][0]["text"] text = candidate["content"]["parts"][0]["text"]