pycoze 0.1.44__tar.gz → 0.1.45__tar.gz

{pycoze-0.1.44 → pycoze-0.1.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.44
+Version: 0.1.45
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

pycoze-0.1.45/pycoze/access/tool_for_bot.py

@@ -0,0 +1,84 @@
+import sys
+import os
+import importlib
+from langchain.agents import tool as _tool
+import types
+import langchain_core
+
+
+def change_directory_and_path(module_path):
+    """Change the current working directory and sys.path."""
+    sys.path.insert(0, module_path)
+    os.chdir(module_path)
+
+
+def restore_directory_and_path(module_path, old_path):
+    """Restore the original working directory and sys.path."""
+    sys.path.remove(module_path)
+    os.chdir(old_path)
+
+
+def wrapped_tool(tool, module_path):
+    """Wrap the tool function to include additional logging and path management."""
+    original_tool_function = tool.func
+
+    def _wrapped_tool(*args, **kwargs):
+        print(f"调用了{tool.name}")
+        old_path = os.getcwd()
+        try:
+            change_directory_and_path(module_path)
+            result = original_tool_function(*args, **kwargs)
+        finally:
+            restore_directory_and_path(module_path, old_path)
+        print(f"{tool.name}调用完毕,结果为:", result)
+        return result
+
+    return _wrapped_tool
+
+
+def import_tools(tool_id):
+    """Import tools from a specified tool_id."""
+    tool_base_path = "../../tool"
+    old_path = os.getcwd()
+    module_path = os.path.join(tool_base_path, tool_id)
+    module_path = os.path.normpath(os.path.abspath(module_path))
+
+    if not os.path.exists(module_path):
+        print(f"Tool {tool_id} not found")
+        return []
+
+    # Save the current sys.modules state
+    original_modules = sys.modules.copy()
+
+    try:
+        change_directory_and_path(module_path)
+        module = importlib.import_module("tool")
+        export_tools = getattr(module, "export_tools")
+        valid_tools = []
+        for tool in export_tools:
+            assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(
+                tool, types.FunctionType
+            ), f"Tool is not a StructuredTool or function: {tool}"
+            if isinstance(tool, types.FunctionType) and not isinstance(
+                tool, langchain_core.tools.StructuredTool
+            ):
+                valid_tools.append(_tool(tool))
+        export_tools = valid_tools
+
+    except Exception as e:
+        print(f"Error loading tool {tool_id}: {e}")
+        restore_directory_and_path(module_path, old_path)
+        return []
+
+    # Unload modules and restore sys.modules state
+    importlib.invalidate_caches()
+    for key in list(sys.modules.keys()):
+        if key not in original_modules:
+            del sys.modules[key]
+
+    restore_directory_and_path(module_path, old_path)
+
+    for tool in export_tools:
+        tool.func = wrapped_tool(tool, module_path)
+
+    return export_tools

{pycoze-0.1.44 → pycoze-0.1.45}/pycoze/bot/bot.py

@@ -45,13 +45,13 @@ def agent_chat(bot_setting_file, history):
             ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
         )
     prompt = role_setting["prompt"]
-    if cfg["model"].startswith("deepseek") and len(tools) > 0:
-        prompt += """
-如果需要调用工具，请使用以下面json格式进行结尾：
-```json
-{"name": 函数名, "parameters": 参数词典}
-```
-"""
+    #     if cfg["model"].startswith("deepseek") and len(tools) > 0:
+    #         prompt += """
+    # 如果需要调用工具，请使用以下面json格式进行结尾：
+    # ```json
+    # {"name": 函数名, "parameters": 参数词典}
+    # ```
+    # """
     agent = Runnable(
         agent_execution_mode=(
             "ReAct" if cfg["model"] in ["command-r"] else "FuncCall"

{pycoze-0.1.44 → pycoze-0.1.45}/pycoze.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.44
+Version: 0.1.45
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.44 → pycoze-0.1.45}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.44",
+    version="0.1.45",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",

pycoze-0.1.44/pycoze/access/tool_for_bot.py

@@ -1,158 +0,0 @@
-# import sys
-# import os
-# import importlib
-# from langchain.agents import tool as _tool
-# import types
-# import langchain_core
-
-# def change_directory_and_path(module_path):
-#     """Change the current working directory and sys.path."""
-#     sys.path.insert(0, module_path)
-#     os.chdir(module_path)
-
-# def restore_directory_and_path(module_path, old_path):
-#     """Restore the original working directory and sys.path."""
-#     sys.path.remove(module_path)
-#     os.chdir(old_path)
-
-# def wrapped_tool(tool, module_path):
-#     """Wrap the tool function to include additional logging and path management."""
-#     original_tool_function = tool.func
-
-#     def _wrapped_tool(*args, **kwargs):
-#         print(f"调用了{tool.name}")
-#         old_path = os.getcwd()
-#         try:
-#             change_directory_and_path(module_path)
-#             result = original_tool_function(*args, **kwargs)
-#         finally:
-#             restore_directory_and_path(module_path, old_path)
-#         print(f"{tool.name}调用完毕,结果为:", result)
-#         return result
-
-#     return _wrapped_tool
-
-# def import_tools(tool_id):
-#     """Import tools from a specified tool_id."""
-#     tool_base_path = "../../tool"
-#     old_path = os.getcwd()
-#     module_path = os.path.join(tool_base_path, tool_id)
-#     module_path = os.path.normpath(os.path.abspath(module_path))
-
-#     if not os.path.exists(module_path):
-#         print(f"Tool {tool_id} not found")
-#         return []
-
-#     # Save the current sys.modules state
-#     original_modules = sys.modules.copy()
-
-#     try:
-#         change_directory_and_path(module_path)
-#         module = importlib.import_module("tool")
-#         export_tools = getattr(module, "export_tools")
-#         valid_tools = []
-#         for tool in export_tools:
-#             assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(
-#                 tool, types.FunctionType
-#             ), f"Tool is not a StructuredTool or function: {tool}"
-#             if isinstance(tool, types.FunctionType) and not isinstance(
-#                 tool, langchain_core.tools.StructuredTool
-#             ):
-#                 valid_tools.append(_tool(tool))
-#         export_tools = valid_tools
-
-#     except Exception as e:
-#         print(f"Error loading tool {tool_id}: {e}")
-#         restore_directory_and_path(module_path, old_path)
-#         return []
-
-#     # Unload modules and restore sys.modules state
-#     importlib.invalidate_caches()
-#     for key in list(sys.modules.keys()):
-#         if key not in original_modules:
-#             del sys.modules[key]
-
-#     restore_directory_and_path(module_path, old_path)
-
-#     for tool in export_tools:
-#         tool.func = wrapped_tool(tool, module_path)
-
-#     return export_tools
-
-import sys
-import os
-import argparse
-import importlib
-from langchain.agents import tool as _tool
-import types
-import langchain_core
-
-
-def wrapped_tool(tool, module_path):
-    old_tool_fun = tool.func
-
-    def _wrapped_tool(*args, **kwargs):
-        print(f"调用了{tool.name}")
-        old_path = os.getcwd()
-        try:
-            sys.path.insert(0, module_path)  # 插入到第一个位置
-            os.chdir(module_path)
-            result = old_tool_fun(*args, **kwargs)
-        finally:
-            sys.path.remove(module_path)
-            os.chdir(old_path)
-        print(f"{tool.name}调用完毕,结果为:", result)
-        return result
-
-    return _wrapped_tool
-
-
-def import_tools(tool_id):
-    print("import_tools")
-    tool_path = "../../tool"
-    old_path = os.getcwd()
-    module_path = os.path.join(tool_path, tool_id)
-    module_path = os.path.normpath(os.path.abspath(module_path))
-
-    if not os.path.exists(module_path):
-        print(f"Tool {tool_id} not found")
-        return []
-
-    # 保存当前的 sys.modules 状态
-    original_modules = sys.modules.copy()
-
-    try:
-        sys.path.insert(0, module_path)  # 插入到第一个位置
-        os.chdir(module_path)
-        module = importlib.import_module("tool")
-        export_tools = getattr(module, "export_tools")
-        temp_list = []
-        for tool in export_tools:
-            assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(
-                tool, types.FunctionType
-            ), f"Tool is not a StructuredTool or function: {tool}"
-            if isinstance(tool, types.FunctionType) and not isinstance(
-                tool, langchain_core.tools.StructuredTool
-            ):
-                temp_list.append(_tool(tool))
-        export_tools = temp_list
-
-    except Exception as e:
-        print(f"Error loading tool {tool_id}: {e}")
-        sys.path.remove(module_path)
-        os.chdir(old_path)
-        return []
-
-    # 卸载模块并恢复 sys.modules 状态
-    importlib.invalidate_caches()
-    for key in list(sys.modules.keys()):
-        if key not in original_modules:
-            del sys.modules[key]
-
-    sys.path.remove(module_path)
-    os.chdir(old_path)
-
-    for tool in export_tools:
-        tool.func = wrapped_tool(tool, module_path)
-
-    return export_tools