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

fix: tool_use regex negative lookahead to prevent cross-tag matching; tgapp relative path resolve

Browse Source
This commit is contained in:
Jiaqing Liang
2026-03-23 11:46:10 +08:00
parent 6f6d9f6570
commit 4b4dc51336
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontends/tgapp.py
View File

@@ -1,5 +1,6 @@
import os, sys, re, threading, asyncio, queue as Q, socket, time import os, sys, re, threading, asyncio, queue as Q, socket, time
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
_TEMP_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'temp')
from agentmain import GeneraticAgent from agentmain import GeneraticAgent
try: try:
from telegram import Update from telegram import Update
@@ -65,6 +66,7 @@ async def _stream(dq, msg):
if done: if done:
files = re.findall(r'\[FILE:([^\]]+)\]', show[-1000:]) files = re.findall(r'\[FILE:([^\]]+)\]', show[-1000:])
for fpath in files: for fpath in files:
if not os.path.isabs(fpath): fpath = os.path.join(_TEMP_DIR, fpath)
if os.path.exists(fpath): if os.path.exists(fpath):
if fpath.lower().endswith(('.png','.jpg','.jpeg','.gif','.webp')): if fpath.lower().endswith(('.png','.jpg','.jpeg','.gif','.webp')):
try: await msg.reply_photo(open(fpath,'rb')) try: await msg.reply_photo(open(fpath,'rb'))

2
llmcore.py
View File

@@ -717,7 +717,7 @@ class ToolClient:
remaining_text = re.sub(think_pattern, "", remaining_text, flags=re.DOTALL) remaining_text = re.sub(think_pattern, "", remaining_text, flags=re.DOTALL)
tool_calls = []; json_strs = []; errors = [] tool_calls = []; json_strs = []; errors = []
tool_pattern = r"<tool_use>(.{15,}?)</tool_use>" tool_pattern = r"<tool_use>((?:(?!<tool_use>).){15,}?)</tool_use>"
tool_all = re.findall(tool_pattern, remaining_text, re.DOTALL) tool_all = re.findall(tool_pattern, remaining_text, re.DOTALL)
if tool_all: if tool_all: