pycoze 0.1.97__tar.gz → 0.1.99__tar.gz

{pycoze-0.1.97 → pycoze-0.1.99}/PKG-INFO

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

pycoze-0.1.99/pycoze/access/bot_for_bot.py

@@ -0,0 +1,40 @@
+import sys
+import os
+import importlib
+from langchain.agents import tool as to_agent_tool
+import types
+import langchain_core
+from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_fun
+
+
+def import_tools(tool_id):
+    tool_base_path = "../../tool"
+    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 []
+
+    try:
+        with ModuleManager(module_path) as manager:
+            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 not isinstance(tool, langchain_core.tools.StructuredTool):
+                    tool = to_agent_tool(tool)
+                valid_tools.append(tool)
+            export_tools = valid_tools
+
+    except Exception as e:
+        print(f"Error loading tool {tool_id}: {e}")
+        return []
+
+    for tool in export_tools:
+        tool.func = wrapped_fun(tool, module_path)
+
+    return export_tools

{pycoze-0.1.97 → pycoze-0.1.99}/pycoze/access/lib.py

@@ -44,4 +44,17 @@ class ModuleManager:
         importlib.invalidate_caches()
         for key in list(sys.modules.keys()):
             if key not in self.original_modules:
-                del sys.modules[key]
+                del sys.modules[key]
+                
+
+def wrapped_fun(item, module_path):
+    original_tool_function = item.func
+
+    def _wrapped(*args, **kwargs):
+        print(f"调用了 {item.name}")
+        with ChangeDirectoryAndPath(module_path):
+            result = original_tool_function(*args, **kwargs)
+        print(f"{item.name} 调用完毕,结果为:", result)
+        return result
+
+    return _wrapped

{pycoze-0.1.97 → pycoze-0.1.99}/pycoze/access/tool_for_bot.py

@@ -4,26 +4,10 @@ import importlib
 from langchain.agents import tool as to_agent_tool
 import types
 import langchain_core
-from .lib import ChangeDirectoryAndPath, ModuleManager
-
-
-
-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}")
-        with ChangeDirectoryAndPath(module_path):
-            result = original_tool_function(*args, **kwargs)
-        print(f"{tool.name}调用完毕,结果为:", result)
-        return result
-
-    return _wrapped_tool
+from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_fun
 
 
 def import_tools(tool_id):
-    """Import tools from a specified tool_id."""
     tool_base_path = "../../tool"
     module_path = os.path.join(tool_base_path, tool_id)
     module_path = os.path.normpath(os.path.abspath(module_path))
@@ -43,7 +27,7 @@ def import_tools(tool_id):
                 ), f"Tool is not a StructuredTool or function: {tool}"
                 if not isinstance(tool, langchain_core.tools.StructuredTool):
                     tool = to_agent_tool(tool)
-                valid_tools.append(to_agent_tool(tool))
+                valid_tools.append(tool)
             export_tools = valid_tools
 
     except Exception as e:
@@ -51,6 +35,6 @@ def import_tools(tool_id):
         return []
 
     for tool in export_tools:
-        tool.func = wrapped_tool(tool, module_path)
+        tool.func = wrapped_fun(tool, module_path)
 
     return export_tools

{pycoze-0.1.97 → pycoze-0.1.99}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.97 → pycoze-0.1.99}/pycoze.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ pycoze.egg-info/SOURCES.txt
 pycoze.egg-info/dependency_links.txt
 pycoze.egg-info/top_level.txt
 pycoze/access/__init__.py
+pycoze/access/bot_for_bot.py
 pycoze/access/lib.py
 pycoze/access/tool_for_bot.py
 pycoze/ai/__init__.py

{pycoze-0.1.97 → pycoze-0.1.99}/setup.py

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