Skip to content

fix: 忽略 Gemini “返回内容为空”的错误消息，将 OpenAI 和 Gemini 的此类消息以 info 级别输出在控制台上。 #2324

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: 忽略 Gemini “返回内容为空”的错误消息，将 OpenAI 和 Gemini 的此类消息以 info 级别输出在控制台上。 #2324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67dbc3a
fix: 忽略 Gemini “返回内容为空”的错误消息，将 OpenAI 和 Gemini 的此类消息以 info 级别输出在控制台上。
MCjiaozi Aug 5, 2025
bf17274
fix: 修改 Gemini 空消息返回逻辑，将 OpenAI 和 Gemini 的空消息提示改为以 debug 级别输出在控制台上。
MCjiaozi Aug 5, 2025
f7b5f72
chore: 删除多余空格
MCjiaozi Aug 5, 2025
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
39 changes: 20 additions & 19 deletions astrbot/core/provider/sources/gemini_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,30 +344,31 @@ def _process_content_parts(

if not result_parts:
logger.debug(result.candidates)
raise Exception("API 返回的内容为空。")
logger.info("API 可能返回了空消息。")

chain = []
part: types.Part

if result_parts: # 避免遍历None导致报错
# 暂时这样Fallback
if all(
part.inline_data and part.inline_data.mime_type.startswith("image/")
for part in result_parts
):
chain.append(Comp.Plain("这是图片"))
for part in result_parts:
if part.text:
chain.append(Comp.Plain(part.text))
elif part.function_call:
llm_response.role = "tool"
llm_response.tools_call_name.append(part.function_call.name)
llm_response.tools_call_args.append(part.function_call.args)
# gemini 返回的 function_call.id 可能为 None
llm_response.tools_call_ids.append(
part.function_call.id or part.function_call.name
)
elif part.inline_data and part.inline_data.mime_type.startswith("image/"):
chain.append(Comp.Image.fromBytes(part.inline_data.data))
if all(
part.inline_data and part.inline_data.mime_type.startswith("image/")
for part in result_parts
):
chain.append(Comp.Plain("这是图片"))
for part in result_parts:
if part.text:
chain.append(Comp.Plain(part.text))
elif part.function_call:
llm_response.role = "tool"
llm_response.tools_call_name.append(part.function_call.name)
llm_response.tools_call_args.append(part.function_call.args)
# gemini 返回的 function_call.id 可能为 None
llm_response.tools_call_ids.append(
part.function_call.id or part.function_call.name
)
elif part.inline_data and part.inline_data.mime_type.startswith("image/"):
chain.append(Comp.Image.fromBytes(part.inline_data.data))
return MessageChain(chain=chain)

async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
Expand Down
3 changes: 3 additions & 0 deletions astrbot/core/provider/sources/openai_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ async def parse_openai_completion(
logger.error(f"API 返回的 completion 无法解析：{completion}。")
raise Exception(f"API 返回的 completion 无法解析：{completion}。")

if llm_response.completion_text == "":
logger.info("API 可能返回了空消息。")

llm_response.raw_completion = completion

return llm_response
Expand Down