BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化gemini变量名

pull/1211/head
foxplaying 2025-08-22 04:17:59 +08:00 committed by GitHub
parent 3c9c83e00e
commit c9108171b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/llm_models/model_client/openai_client.py
View File

@ -38,7 +38,7 @@ from ..payload_content.tool_option import ToolOption, ToolParam, ToolCall
logger = get_logger("OpenAI客户端") logger = get_logger("OpenAI客户端")
def _convert_messages(messages: list[Message]) -> list[ChatCompletionMessageParam]: def _convert_messages(messages: list[Message], gemini: bool) -> list[ChatCompletionMessageParam]:
""" """
转换消息格式 - 将消息转换为OpenAI API所需的格式 转换消息格式 - 将消息转换为OpenAI API所需的格式
:param messages: 消息列表 :param messages: 消息列表
@ -60,7 +60,7 @@ def _convert_messages(messages: list[Message]) -> list[ChatCompletionMessagePara
content = [] content = []
for item in message.content: for item in message.content:
if isinstance(item, tuple): if isinstance(item, tuple):
image_format = "jpeg" if "gemini-" in model_info.model_identifier and item[0].lower() == "jpg" else item[0].lower() image_format = "jpeg" if gemini and item[0].lower() == "jpg" else item[0].lower()
content.append( content.append(
{ {
"type": "image_url", "type": "image_url",
@ -433,16 +433,17 @@ class OpenaiClient(BaseClient):
if async_response_parser is None: if async_response_parser is None:
async_response_parser = _default_normal_response_parser async_response_parser = _default_normal_response_parser
# 检测gemini
gemini = "gemini-" in model_info.model_identifier
# 将messages构造为OpenAI API所需的格式 # 将messages构造为OpenAI API所需的格式
messages: Iterable[ChatCompletionMessageParam] = _convert_messages(message_list) messages: Iterable[ChatCompletionMessageParam] = _convert_messages(message_list, gemini)
# 将tool_options转换为OpenAI API所需的格式 # 将tool_options转换为OpenAI API所需的格式
tools: Iterable[ChatCompletionToolParam] = _convert_tool_options(tool_options) if tool_options else NOT_GIVEN # type: ignore tools: Iterable[ChatCompletionToolParam] = _convert_tool_options(tool_options) if tool_options else NOT_GIVEN # type: ignore
# 创建最终的参数副本，避免修改原始参数 # 创建最终的参数副本，避免修改原始参数
final_extra_params = extra_params.copy() if extra_params else {} final_extra_params = extra_params.copy() if extra_params else {}
# 检测 Gemini 模型并处理 thinking_budget # 检测 Gemini 模型并处理 thinking_budget
if "gemini-" in model_info.model_identifier and "thinking_budget" in final_extra_params: if gemini and "thinking_budget" in final_extra_params:
# 延迟导入模块级函数和常量，避免循环依赖 # 延迟导入模块级函数和常量，避免循环依赖
from .gemini_client import clamp_thinking_budget, THINKING_BUDGET_AUTO from .gemini_client import clamp_thinking_budget, THINKING_BUDGET_AUTO
@ -454,7 +455,7 @@ class OpenaiClient(BaseClient):
tb = clamp_thinking_budget(tb, model_info.model_identifier) tb = clamp_thinking_budget(tb, model_info.model_identifier)
final_extra_params["thinking_budget"] = tb final_extra_params["thinking_budget"] = tb
elif "gemini-" not in model_info.model_identifier and "thinking_budget" in final_extra_params: elif not gemini and "thinking_budget" in final_extra_params:
# 对于非 Gemini 模型，移除 thinking_budget 参数（如果存在） # 对于非 Gemini 模型，移除 thinking_budget 参数（如果存在）
final_extra_params.pop("thinking_budget", None) final_extra_params.pop("thinking_budget", None)