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

ctools/ai/llm_chat.py

@@ -1,10 +1,8 @@
-import enum
-import re
-
 from ctools import sys_log
 from ctools.ai.llm_client import LLMClient
 from ctools.ai.mcp.mcp_client import MCPClient, res_has_img, is_image_content, get_tools_prompt, mcp_tool_call
 from ctools.ai.tools.xml_extract import extract_all_xml_blocks
+from ctools.ai.tools.think_process import remove_think_blocks
 
 log = sys_log.flog
 
@@ -22,10 +20,6 @@ class ROLE:
 def get_message_json(role_type: ROLE, content):
   return {"role": role_type, "content": content}
 
-def remove_think_blocks(text: str) -> str:
-  cleaned_text = re.sub(r"<think>.*?</think>", "", text, flags=re.DOTALL)
-  return cleaned_text.strip()
-
 class ChatSession:
 
   def __init__(self, prompts: str, llm_client: LLMClient, max_tools_call: int = 10, mcp_clients: list[MCPClient] = None,
@@ -50,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:
@@ -134,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/llm_client.py

@@ -23,7 +23,17 @@ def process_SSE(line):
 class LLMClient:
   """Manages communication with the LLM provider."""
 
-  def __init__(self, api_key: str=os.getenv("LLM_API_KEY"), llm_url: str="https://api.siliconflow.cn/v1/", model_name: str="Qwen/Qwen3-235B-A22B", temperature: float=1, stream: bool=True, thinking: bool=True, thinking_budget: int=4096, max_tokens: int=8192) -> None:
+  def __init__(self, api_key: str=os.getenv("LLM_API_KEY"),
+               llm_url: str="https://api.siliconflow.cn/v1/",
+               model_name: str="Qwen/Qwen3-235B-A22B",
+               temperature: float=1, stream: bool=True,
+               thinking: bool=True,
+               thinking_budget: int=4096,
+               max_tokens: int=8192,
+               top_p: float=0.5,
+               top_k: int=50,
+               frequency_penalty: float=0.5
+              ) -> None:
     self.api_key = api_key
     self.llm_url = llm_url
     self.model_name = model_name
@@ -32,6 +42,9 @@ class LLMClient:
     self.thinking = thinking
     self.thinking_budget = thinking_budget
     self.max_tokens = max_tokens
+    self.top_p = top_p
+    self.top_k = top_k
+    self.frequency_penalty = frequency_penalty
 
   async def model_completion(self, messages: list[dict[str, str]]):
     self.no_think_compatible(messages)
@@ -45,9 +58,9 @@ class LLMClient:
       "model": self.model_name,
       "temperature": self.temperature,
       "max_tokens": self.max_tokens,
-      "top_p": 0.5,
-      "top_k": 50,
-      "frequency_penalty": 0.7,
+      "top_p": self.top_p,
+      "top_k": self.top_k,
+      "frequency_penalty": self.frequency_penalty,
       "stream": self.stream,
       "enable_thinking": self.thinking,
       "thinking_budget": self.thinking_budget

ctools/ai/tools/json_extract.py

@@ -5,6 +5,9 @@ __date__ = '2025/5/19 16:45'
 
 import re
 
+from ctools import cjson
+
+
 def extract_json_from_text(text):
   """
   从混杂文本中提取第一个完整的 JSON 对象
@@ -44,3 +47,155 @@ def extract_json_from_text(text):
 
   return None
 
+if __name__ == '__main__':
+    xx = """
+    <think>
+
+</think>
+
+{
+  "sjbs": {
+    "xsbt": "东都公园业主集体信访事件",
+    "sjbh": "202406031234",
+    "jjcd": ["黄"]
+  },
+  "skys": {
+    "zxsj": [
+      {
+        "jqsj": "2024-06-03 09:00",
+        "sjms": "6月3日",
+        "sjlx": ["计划时间"]
+      }
+    ],
+    "zxdd": [
+      {
+        "bzdz": "黑龙江省哈尔滨市信访局",
+        "cslx": ["政府机关"]
+      }
+    ]
+  },
+  "ssqt": {
+    "qtms": ["哈尔滨市道外区东都公园业主"],
+    "qtgm": ["约5人以上，可能发展至群体性事件"],
+    "qtbq": ["房地产纠纷", "历史遗留问题"],
+    "zztz": ["有核心组织"]
+  },
+  "ryqd": [
+    {
+      "xm": ["杨开亮"],
+      "sfzh": ["2301251968101335**"],
+      "js": ["组织者"],
+      "hjd": ["哈尔滨市宾县满井镇永宁村崔海屯"],
+      "jzd": ["团结镇东都公元一区五栋二单元603"],
+      "lxdh": ["139366789**"],
+      "rybq": ["重点人"],
+      "wlzh": {
+        "wx": [],
+        "qq": []
+      },
+      "gjxx": [
+        {
+          "sj": ["2024-05-28 20:26"],
+          "dd": ["网络群聊"],
+          "xw": ["组织动员"]
+        }
+      ]
+    },
+    {
+      "xm": ["孙凤玲"],
+      "sfzh": ["2301041955121712**"],
+      "js": ["积极参与者"],
+      "hjd": ["哈尔滨市道外区迎新街好民居滨港水岸D15栋1单元14层4号"],
+      "jzd": ["道外区陶瓷小区D15-1-1404"],
+      "lxdh": ["17758887348"],
+      "rybq": [],
+      "wlzh": {
+        "wx": [],
+        "qq": []
+      },
+      "gjxx": [
+        {
+          "sj": ["2024-05-28 19:00"],
+          "dd": ["网络群聊"],
+          "xw": ["响应组织"]
+        }
+      ]
+    },
+    {
+      "xm": ["高秀艳"],
+      "sfzh": ["2323261982060762**"],
+      "js": ["积极参与者"],
+      "hjd": ["绥化市青冈县劳动乡北斗村丛喜云屯"],
+      "jzd": ["哈尔滨市道外区团结镇森桐木业"],
+      "lxdh": ["15846349146"],
+      "rybq": [],
+      "wlzh": {
+        "wx": [],
+        "qq": []
+      },
+      "gjxx": [
+        {
+          "sj": ["2024-05-28 20:00"],
+          "dd": ["网络群聊"],
+          "xw": ["响应组织"]
+        }
+      ]
+    },
+    {
+      "xm": ["高振凤"],
+      "sfzh": ["2323031974103046**"],
+      "js": ["一般参与者"],
+      "hjd": ["绥化市肇东市东发乡夕阳村郭家屯"],
+      "jzd": ["团结镇团结镇东都公园一区七栋一单元101"],
+      "lxdh": ["18004659805"],
+      "rybq": [],
+      "wlzh": {
+        "wx": [],
+        "qq": []
+      },
+      "gjxx": [
+        {
+          "sj": ["2024-05-28 19:30"],
+          "dd": ["网络群聊"],
+          "xw": ["响应组织"]
+        }
+      ]
+    },
+    {
+      "xm": ["陈立军"],
+      "sfzh": ["2301251980031907**"],
+      "js": ["组织者", "群主"],
+      "hjd": ["哈尔滨市宾县宾西镇一委六组"],
+      "jzd": [],
+      "lxdh": ["15776806667"],
+      "rybq": ["重点人"],
+      "wlzh": {
+        "wx": [],
+        "qq": []
+      },
+      "gjxx": [
+        {
+          "sj": ["2024-05-28 19:00"],
+          "dd": ["网络群聊"],
+          "xw": ["组织动员"]
+        }
+      ]
+    }
+  ],
+  "sjtz": {
+    "xwlx": ["集体信访", "网络串联"],
+    "sqnr": ["要求政府解决房产证办理问题，明确责任主体并推动政策落实"],
+    "dktz": [],
+    "zjly": ["自筹"]
+  },
+  "czjy": {
+    "zrdw": ["哈尔滨市公安局道外分局", "信访维稳专班"],
+    "yjcs": ["提前约谈重点人员", "加强网络群组监控", "部署现场警力"]
+  }
+}
+20250603142141-INFO-8399134464-web_log(log:214) 127.0.0.1 [03/Jun/2025:14:18:39 +0800] "POST /chat/completion HTTP/1.1" 200 3670 "-" "python-requests/2.32.3"
+
+
+    """
+
+    print((cjson.dumps(extract_json_from_text(xx))))

ctools/ai/tools/think_process.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+__author__ = 'haoyang'
+__date__ = '2025/6/3 14:30'
+
+import re
+
+
+def remove_think_blocks(text: str) -> str:
+  cleaned_text = re.sub(r"<think>.*?</think>", "", text, flags=re.DOTALL)
+  return cleaned_text.strip()

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.5.dist-info → gomyck_tools-1.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gomyck-tools
-Version: 1.3.5
+Version: 1.3.7
 Summary: A tools collection for python development by hao474798383
 Author-email: gomyck <hao474798383@163.com>
 License-Expression: Apache-2.0
@@ -33,7 +33,9 @@ Provides-Extra: db
 Requires-Dist: sqlalchemy>=2.0; extra == "db"
 Requires-Dist: asyncpg>=0.28; extra == "db"
 Provides-Extra: office
-Requires-Dist: python-docx==1.1.2; extra == "office"
+Requires-Dist: pandas>=2.2.3; extra == "office"
+Requires-Dist: xlrd>=2.0.1; extra == "office"
+Requires-Dist: python-docx>=1.1.2; extra == "office"
 Provides-Extra: auto-ui
 Requires-Dist: pynput==1.7.7; extra == "auto-ui"
 Dynamic: license-file

{gomyck_tools-1.3.5.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,16 +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=E4ivclYISDo0DLt-lIRrtv-44qtQuWD9LE7wsivWDZw,8487
-ctools/ai/llm_client.py,sha256=6hifeqUnLeYOLtSn1tfx5MtUrwJuFm7WelbKLtR0U0A,4758
+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=R_cVAUJG78cO5-irREKaFq-QXI3w7T1soORVv9Y8-aw,1039
-ctools/ai/tools/tool_use_xml_parse.py,sha256=ZS_9SPxI6ZxwgSOl0QQV5G7HCE72l1rrrkJgUid1NyI,1302
+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=zpHKMhU5LFSpuznU_Z5w_HHp-Bney-Te8DxoU1BNHZ0,1429
 ctools/ai/tools/xml_extract.py,sha256=KTzsrJZDKmpJ-92yTO6z5nJ9a183ngF6ikTb4oiIjW4,246
-gomyck_tools-1.3.5.dist-info/licenses/LICENSE,sha256=X25ypfH9E6VTht2hcO8k7LCSdHUcoG_ALQt80jdYZfY,547
-gomyck_tools-1.3.5.dist-info/METADATA,sha256=Gt3-DuFNL_xZsDAGWt5L4iu0ADLnNz2QbIN-ha8Zdtk,1501
-gomyck_tools-1.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gomyck_tools-1.3.5.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.3.5.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,,