Skip to content

fix: handle delta=None chunks in streaming to prevent SDK to_dict() error #8244

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
x1051445024 wants to merge 4 commits into
base: master
Choose a base branch
from
+19 −8
Open

fix: handle delta=None chunks in streaming to prevent SDK to_dict() error #8244

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
086afb2
fix: handle delta=None chunks in streaming to prevent SDK to_dict() e…
x1051445024 May 19, 2026
bc6ba58
fix: resolve bugs found by Sourcery and gemini-code-assist review
x1051445024 May 19, 2026
16b2ead
fix: properly replace get_final_completion fallback in _query_stream
x1051445024 May 19, 2026
ac6314f
fix: revert corrupted terminate() to original
x1051445024 May 19, 2026
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
27 changes: 19 additions & 8 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 @@ -669,10 +669,14 @@ async def _query_stream(
# Gemini and some OpenAI-compatible proxies omit this field
if not hasattr(tc, "index") or tc.index is None:
tc.index = idx
try:
state.handle_chunk(chunk)
except Exception as e:
logger.error("Saving chunk state error: " + str(e))
# 跳过 delta=None 的 chunk，避免 SDK 内部 _convert_initial_chunk_into_snapshot
# 第 747 行 choice.delta.to_dict() 抛出 NoneType 错误。
# refs: AstrBot#6689 / openai-python#5069 / #5047
if delta is not None:
try:
state.handle_chunk(chunk)
except Exception as e:
logger.error("Saving chunk state error: " + str(e))
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
# logger.debug(f"chunk delta: {delta}")
# handle the content delta
reasoning = self._extract_reasoning_content(chunk)
Expand Down Expand Up @@ -700,10 +704,14 @@ async def _query_stream(
if _y:
yield llm_response

final_completion = state.get_final_completion()
llm_response = await self._parse_openai_completion(final_completion, tools)

yield llm_response
try:
final_completion = state.get_final_completion()
llm_response = await self._parse_openai_completion(final_completion, tools)
yield llm_response
except Exception as e:
logger.error("get_final_completion error: " + str(e))
# 流式内容已通过 yield 发出，记录错误后正常结束即可
return

def _extract_reasoning_content(
self,
Expand Down Expand Up @@ -901,6 +909,9 @@ async def _parse_openai_completion(
args = {}
else:
args = tool_call.function.arguments
# Some API may return None for tools with no parameters
if args is None:
args = {}
args_ls.append(args)
func_name_ls.append(tool_call.function.name)
tool_call_ids.append(tool_call.id)
Expand Down