ys/GenericAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine llmcore debug and tool parsing

Browse Source
This commit is contained in:
Liang Jiaqing
2026-04-02 21:16:45 +08:00
parent 88f32b208b
commit b0d4563ae8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
llmcore.py
View File

@@ -439,7 +439,7 @@ class BaseSession:
try: try:
while True: chunk = next(gen); content += chunk; yield chunk while True: chunk = next(gen); content += chunk; yield chunk
except StopIteration as e: content_blocks = e.value or [] except StopIteration as e: content_blocks = e.value or []
print(f"[DEBUG BaseSession.ask] content_blocks: {content_blocks}") if len(content_blocks) > 1: print(f"[DEBUG BaseSession.ask] content_blocks: {content_blocks}")
for block in (content_blocks or []): for block in (content_blocks or []):
if block.get('type', '') == 'tool_use': if block.get('type', '') == 'tool_use':
tu = {'name': block.get('name', ''), 'arguments': block.get('input', {})} tu = {'name': block.get('name', ''), 'arguments': block.get('input', {})}
@@ -680,7 +680,7 @@ class ToolClient:
json_strs.extend([s for s in tool_all if s.startswith('{') and s.endswith('}')]) json_strs.extend([s for s in tool_all if s.startswith('{') and s.endswith('}')])
remaining_text = re.sub(tool_pattern, "", remaining_text, flags=re.DOTALL) remaining_text = re.sub(tool_pattern, "", remaining_text, flags=re.DOTALL)
elif '<tool_use>' in remaining_text: elif '<tool_use>' in remaining_text:
weaktoolstr = remaining_text.split('<tool_use>')[-1].strip() weaktoolstr = remaining_text.split('<tool_use>')[-1].strip().strip('><')
json_str = weaktoolstr if weaktoolstr.endswith('}') else '' json_str = weaktoolstr if weaktoolstr.endswith('}') else ''
if json_str == '' and '```' in weaktoolstr and weaktoolstr.split('```')[0].strip().endswith('}'): if json_str == '' and '```' in weaktoolstr and weaktoolstr.split('```')[0].strip().endswith('}'):
json_str = weaktoolstr.split('```')[0].strip() json_str = weaktoolstr.split('```')[0].strip()