pycoze 0.1.93__tar.gz → 0.1.95__tar.gz

{pycoze-0.1.93 → pycoze-0.1.95}/PKG-INFO

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

pycoze-0.1.95/pycoze/access/lib.py

@@ -0,0 +1,46 @@
+import os
+import sys
+
+
+class ChangeDirectoryAndPath:
+    """Context manager to change the current working directory and sys.path."""
+
+    def __init__(self, module_path):
+        self.module_path = module_path
+        self.old_path = None
+
+    def __enter__(self):
+        self.old_path = os.getcwd()
+        sys.path.insert(0, self.module_path)
+        os.chdir(self.module_path)
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        sys.path.remove(self.module_path)
+        os.chdir(self.old_path)
+        
+
+class ModuleManager:
+    """Context manager for handling module imports and sys.modules state."""
+
+    def __init__(self, module_path):
+        self.module_path = module_path
+        self.original_modules = sys.modules.copy()
+
+    def __enter__(self):
+        """Enter the runtime context related to this object."""
+        self.change_dir = ChangeDirectoryAndPath(self.module_path)
+        self.change_dir.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        """Exit the runtime context related to this object."""
+        self.change_dir.__exit__(exc_type, exc_value, traceback)
+        self.cleanup_modules()
+
+    def cleanup_modules(self):
+        """Restore the original sys.modules state."""
+        importlib.invalidate_caches()
+        for key in list(sys.modules.keys()):
+            if key not in self.original_modules:
+                del sys.modules[key]

pycoze-0.1.95/pycoze/access/tool_for_bot.py

@@ -0,0 +1,56 @@
+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
+
+
+
+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
+
+
+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))
+
+    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 isiisinstance(tool, langchain_core.tools.StructuredTool):
+                    tool = to_agent_tool(tool)
+                valid_tools.append(to_agent_tool(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_tool(tool, module_path)
+
+    return export_tools

{pycoze-0.1.93 → pycoze-0.1.95}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.93 → pycoze-0.1.95}/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/lib.py
 pycoze/access/tool_for_bot.py
 pycoze/ai/__init__.py
 pycoze/ai/vram_reserve.py

{pycoze-0.1.93 → pycoze-0.1.95}/setup.py

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

pycoze-0.1.93/pycoze/access/tool_for_bot.py

@@ -1,84 +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