kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-07-21 06:07:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: adjust the context of restart loading

Browse Source
This commit is contained in:
zhayujie
2026-03-03 11:38:14 +08:00
parent 63d9325900
commit 0f23b209ad
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
agent/chat/service.py
View File

@@ -68,9 +68,24 @@ class ChatService:
# a new segment; collect tool results until turn_end. # a new segment; collect tool results until turn_end.
state.pending_tool_results = [] state.pending_tool_results = []
elif event_type == "tool_execution_end": elif event_type == "tool_execution_start":
# Notify the client that a tool is about to run (with its input args)
tool_name = data.get("tool_name", "") tool_name = data.get("tool_name", "")
arguments = data.get("arguments", {}) arguments = data.get("arguments", {})
# Cache arguments keyed by tool_call_id so tool_execution_end can include them
tool_call_id = data.get("tool_call_id", tool_name)
state.pending_tool_arguments[tool_call_id] = arguments
send_chunk_fn({
"chunk_type": "tool_start",
"tool": tool_name,
"arguments": arguments,
})
elif event_type == "tool_execution_end":
tool_name = data.get("tool_name", "")
tool_call_id = data.get("tool_call_id", tool_name)
# Retrieve cached arguments from the matching tool_execution_start event
arguments = state.pending_tool_arguments.pop(tool_call_id, data.get("arguments", {}))
result = data.get("result", "") result = data.get("result", "")
status = data.get("status", "unknown") status = data.get("status", "unknown")
execution_time = data.get("execution_time", 0) execution_time = data.get("execution_time", 0)
@@ -167,3 +182,6 @@ class _StreamState:
# None means we are not accumulating tool results right now. # None means we are not accumulating tool results right now.
# A list means we are in the middle of a tool-execution phase. # A list means we are in the middle of a tool-execution phase.
self.pending_tool_results: Optional[list] = None self.pending_tool_results: Optional[list] = None
# Maps tool_call_id -> arguments captured from tool_execution_start,
# so that tool_execution_end can attach the correct input args.
self.pending_tool_arguments: dict = {}

2
bridge/agent_initializer.py
View File

@@ -147,7 +147,7 @@ class AgentInitializer:
from agent.memory import get_conversation_store from agent.memory import get_conversation_store
store = get_conversation_store() store = get_conversation_store()
max_turns = conf().get("agent_max_context_turns", 20) max_turns = conf().get("agent_max_context_turns", 20)
restore_turns = max(6, max_turns // 5) restore_turns = max(3, max_turns // 6)
saved = store.load_messages(session_id, max_turns=restore_turns) saved = store.load_messages(session_id, max_turns=restore_turns)
if saved: if saved:
filtered = self._filter_text_only_messages(saved) filtered = self._filter_text_only_messages(saved)