fix:The handling logic of remove_think in the connector and Temporarily blocked the processing of streaming tool calls in the runner.

This commit is contained in:
Dong_master
2025-08-05 04:24:03 +08:00
parent 5597dffaeb
commit e88302f1b4
5 changed files with 145 additions and 129 deletions
@@ -54,20 +54,12 @@ class PPIOChatCompletions(chatcmpl.OpenAIChatCompletions):
return message
async def _make_msg_chunk(
self,
remove_think: bool,
chat_completion: chat_completion.ChatCompletion,
idx: int,
self,
delta: dict[str, typing.Any],
idx: int,
) -> llm_entities.MessageChunk:
# 处理流式chunk和完整响应的差异
# print(chat_completion.choices[0])
if hasattr(chat_completion, 'choices'):
# 完整响应模式
choice = chat_completion.choices[0]
delta = choice.delta.model_dump() if hasattr(choice, 'delta') else choice.message.model_dump()
else:
# 流式chunk模式
delta = chat_completion.delta.model_dump() if hasattr(chat_completion, 'delta') else {}
# 确保 role 字段存在且不为 None
if 'role' not in delta or delta['role'] is None:
@@ -79,20 +71,9 @@ class PPIOChatCompletions(chatcmpl.OpenAIChatCompletions):
# print(reasoning_content)
# deepseek的reasoner模型
if remove_think:
if '<think>' in delta['content']:
self.is_think = True
delta['content'] = ''
if r'</think>' in delta['content']:
self.is_think = False
delta['content'] = ''
if not self.is_think:
delta['content'] = delta['content']
else:
delta['content'] = ''
else:
if reasoning_content is not None:
delta['content'] += reasoning_content
if reasoning_content is not None:
delta['content'] += reasoning_content
message = llm_entities.MessageChunk(**delta)
@@ -135,11 +116,33 @@ class PPIOChatCompletions(chatcmpl.OpenAIChatCompletions):
current_content = ''
args['stream'] = True
chunk_idx = 0
self.is_content = False
is_think = False
tool_calls_map: dict[str, llm_entities.ToolCall] = {}
async for chunk in self._req_stream(args, extra_body=extra_args):
# 处理流式消息
delta_message = await self._make_msg_chunk(remove_think, chunk, chunk_idx)
if hasattr(chunk, 'choices'):
# 完整响应模式
if chunk.choices:
choice = chunk.choices[0]
delta = choice.delta.model_dump() if hasattr(choice, 'delta') else choice.message.model_dump()
else:
continue
else:
# 流式chunk模式
delta = chunk.delta.model_dump() if hasattr(chunk, 'delta') else {}
if remove_think:
if delta['content'] is not None:
if '<think>' in delta['content']:
is_think = True
continue
elif delta['content'] == r'</think>':
is_think = False
continue
elif is_think or delta['content'] == '\n\n':
continue
delta_message = await self._make_msg_chunk(delta, chunk_idx)
# 处理流式消息
if delta_message.content:
current_content += delta_message.content
delta_message.content = current_content
@@ -164,5 +167,4 @@ class PPIOChatCompletions(chatcmpl.OpenAIChatCompletions):
delta_message.is_final = True
delta_message.content = current_content
if chunk_idx % 64 == 0 or delta_message.is_final:
yield delta_message
yield delta_message