gomyck-tools 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl

ctools/ai/llm_chat.py

@@ -44,6 +44,7 @@ class ChatSession:
 
     self.current_message = {}
     self.full_messages = []
+    self.is_success = True
 
   async def init_prompts(self, user_system_prompt):
     if self.mcp_clients:
@@ -128,6 +129,7 @@ class ChatSession:
 
   async def process_error_message(self, error_msg, get_call_id, get_event_msg_func, get_full_msg_func):
     # 最终结果通知前端+实时通知都要有
+    self.is_success = False
     self.current_message = error_msg
     if get_event_msg_func: await get_event_msg_func(get_call_id(), ROLE.ASSISTANT, self.current_message)
     if get_full_msg_func: await get_full_msg_func(get_call_id(), True, self.full_messages)

ctools/ai/tools/tool_use_xml_parse.py

@@ -9,13 +9,20 @@ def parse_tool_use(xml_string):
     root = ET.fromstring(xml_string.strip())
     if root.tag != "tool_use": raise ValueError("根标签必须是 <tool_use>")
     tool_name = root.find("name").text.strip()
-    arguments_text = root.find("arguments").text.strip()
-    arguments_text = html.unescape(arguments_text)
-    arguments = json.loads(arguments_text)
-    return {
-      "tool": tool_name,
-      "arguments": arguments
-    }
+    args = root.find("arguments").text
+    if args:
+      arguments_text = args.strip()
+      arguments_text = html.unescape(arguments_text)
+      arguments = json.loads(arguments_text)
+      return {
+        "tool": tool_name,
+        "arguments": arguments
+      }
+    else:
+      return {
+        "tool": tool_name,
+        "arguments": {}
+      }
   except Exception as e:
     raise ValueError(f"tool_use_{tool_name} 解析失败: {e}")
 

ctools/aio_web_server.py

@@ -5,17 +5,30 @@
 __author__ = 'haoyang'
 __date__ = '2025/5/30 09:54'
 
-import asyncio
 import sys
 from pathlib import Path
 from typing import Optional, Dict, Any
 
 from aiohttp import web
 
-from ctools import sys_info
+from ctools import sys_info, cjson
+from ctools.api_result import R
 
 DEFAULT_PORT = 8888
 
+@web.middleware
+async def response_wrapper_middleware(request, handler):
+  try:
+    result = await handler(request)
+    if isinstance(result, web.Response):
+      return result
+    elif isinstance(result, str):
+      return web.Response(text=result)
+    else:
+      return web.Response(text=cjson.dumps(result))
+  except Exception as e:
+    return web.json_response(text=R.error(str(e)), status=200)
+
 class AioHttpServer:
   def __init__(self, port: int = DEFAULT_PORT, app: Optional[web.Application] = None, routes: Optional[web.RouteTableDef] = None, async_func = None):
     """
@@ -25,7 +38,7 @@ class AioHttpServer:
         port: Port number to listen on
         app: Optional existing aiohttp Application instance
     """
-    self.app = app or web.Application()
+    self.app = app or web.Application(middlewares=[response_wrapper_middleware])
     self.port = port
     self.index_root = Path('./')
     self.index_filename = 'index.html'
@@ -58,7 +71,6 @@ class AioHttpServer:
       return web.HTTPNotFound()
 
     if self.is_tpl:
-      # If using templates, you might want to use a template engine here
       return web.FileResponse(
         index_path,
         headers={'Content-Type': 'text/html'}

{gomyck_tools-1.3.6.dist-info → gomyck_tools-1.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gomyck-tools
-Version: 1.3.6
+Version: 1.3.7
 Summary: A tools collection for python development by hao474798383
 Author-email: gomyck <hao474798383@163.com>
 License-Expression: Apache-2.0

{gomyck_tools-1.3.6.dist-info → gomyck_tools-1.3.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ctools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctools/aes_tools.py,sha256=L5Jg4QtVTdIxHe9zEpR8oMQx0IrYK68vjEYb_RmkhPA,699
-ctools/aio_web_server.py,sha256=NRishyg8cbaC9yugOnefnDjYdjlE2zwB0gzRJV5Tr6M,4353
+ctools/aio_web_server.py,sha256=W4vqHBr4VxaKppRmotyRamOf59f0WU6iYQHGqKFvPJs,4746
 ctools/api_result.py,sha256=UeQXI_zuZB-uY5qECTpz1fC7EGy82yGQqWMx20tyRTw,1572
 ctools/application.py,sha256=DcuSt2m8cDuSftx6eKfJ5gA6_F9dDlzkj0K86EG4F7s,15884
 ctools/b64.py,sha256=_BdhX3p3-MaSSlU2wivN5qPxQfacR3VRBr1WC456tU0,194
@@ -60,17 +60,17 @@ ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,98
 ctools/work_path.py,sha256=OmfYu-Jjg2huRY6Su8zJ_2EGFFhtBZFbobYTwbjJtG4,1817
 ctools/ai/__init__.py,sha256=gTYAICILq48icnFbg0HCbsQO8PbU02EDOQ0JeMvfqTY,98
 ctools/ai/env_config.py,sha256=hOuDVjyK00Ioq1G2z9Plf20TQha0tMV-VHWKAeCv16s,990
-ctools/ai/llm_chat.py,sha256=OCI8YKpvZHtznbCNfvMqX1xYO2ER5ns5dbx0PfqSFmQ,8378
+ctools/ai/llm_chat.py,sha256=xcjk9ALp9GfTlcHGCMOTYi7MuWoBFB73bmKAL9NedfY,8433
 ctools/ai/llm_client.py,sha256=Zqizex4Umozqtfh__-wdgNu8p66Bl9iv6cLbNUGyRF8,5098
 ctools/ai/mcp/__init__.py,sha256=gTYAICILq48icnFbg0HCbsQO8PbU02EDOQ0JeMvfqTY,98
 ctools/ai/mcp/mcp_client.py,sha256=HLoGN-yCL5vMxwxcZMmXQyWof-nmp1KjrPrXQ46KGQs,11525
 ctools/ai/tools/__init__.py,sha256=gPc-ViRgtFlfX7JUbk5wQZ3wkJ5Ylh14CIqPwa83VPs,98
 ctools/ai/tools/json_extract.py,sha256=bgubZ2RwTo_R1X0CzMnvBWu61hglB1l6oO553645RXc,4842
 ctools/ai/tools/think_process.py,sha256=RGU9j3_O328Byw05ILek-aMfFBczbly2RA-QRouqUjM,257
-ctools/ai/tools/tool_use_xml_parse.py,sha256=ZS_9SPxI6ZxwgSOl0QQV5G7HCE72l1rrrkJgUid1NyI,1302
+ctools/ai/tools/tool_use_xml_parse.py,sha256=zpHKMhU5LFSpuznU_Z5w_HHp-Bney-Te8DxoU1BNHZ0,1429
 ctools/ai/tools/xml_extract.py,sha256=KTzsrJZDKmpJ-92yTO6z5nJ9a183ngF6ikTb4oiIjW4,246
-gomyck_tools-1.3.6.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
-gomyck_tools-1.3.6.dist-info/METADATA,sha256=Rr55l---p-ZCAQAtC65gyb8_sszK-gTEcIkQuJAjVPI,1595
-gomyck_tools-1.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gomyck_tools-1.3.6.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.3.6.dist-info/RECORD,,
+gomyck_tools-1.3.7.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
+gomyck_tools-1.3.7.dist-info/METADATA,sha256=VFfjvXYkg1-Pfwksb08fqdFftCuNd4sjJTWwpAVcaOo,1595
+gomyck_tools-1.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gomyck_tools-1.3.7.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.3.7.dist-info/RECORD,,