pycoze 0.1.93__py3-none-any.whl → 0.1.95__py3-none-any.whl

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/access/tool_for_bot.py

@@ -1,22 +1,12 @@
 import sys
 import os
 import importlib
-from langchain.agents import tool as _tool
+from langchain.agents import tool as to_agent_tool
 import types
 import langchain_core
+from .lib import ChangeDirectoryAndPath, ModuleManager
 
 
-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."""
@@ -24,12 +14,8 @@ def wrapped_tool(tool, module_path):
 
     def _wrapped_tool(*args, **kwargs):
         print(f"调用了{tool.name}")
-        old_path = os.getcwd()
-        try:
-            change_directory_and_path(module_path)
+        with ChangeDirectoryAndPath(module_path):
             result = original_tool_function(*args, **kwargs)
-        finally:
-            restore_directory_and_path(module_path, old_path)
         print(f"{tool.name}调用完毕,结果为:", result)
         return result
 
@@ -39,7 +25,6 @@ def wrapped_tool(tool, module_path):
 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))
 
@@ -47,37 +32,24 @@ def import_tools(tool_id):
         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
+        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}")
-        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)
 

{pycoze-0.1.93.dist-info → pycoze-0.1.95.dist-info}/METADATA

@@ -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.dist-info → pycoze-0.1.95.dist-info}/RECORD

@@ -1,7 +1,8 @@
 pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/module.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/access/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/access/tool_for_bot.py,sha256=Nv6XlxcqaLaMVQNDkpcthlqaSxyfHoOfWiTScQXO22Y,2656
+pycoze/access/lib.py,sha256=TUK-kh09LTjzin_A7Fj-JayxWiB5p_pw2nP8nJU1u5o,1496
+pycoze/access/tool_for_bot.py,sha256=ZVwI3_6gw5eJQ9qyGSwTTcGx9zAoSDPtdWGNzRMdhTU,1855
 pycoze/ai/__init__.py,sha256=odM2lgYSnApxw4AzLV_5AyaxL5_MLfydOSB1VmLGFyA,75
 pycoze/ai/vram_reserve.py,sha256=QbqaA8qv87cnEpOVDMygi0BNMxuhLYwj1UKfR_D5BD4,4340
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
@@ -20,8 +21,8 @@ pycoze/ui/ui_def.py,sha256=UhhU_yB3GV9ISbvTWT48hsHPHI250BhMILh6bu5Uioo,4206
 pycoze/utils/__init__.py,sha256=TNJhFfY7JYdLlzuP9GvgxfNXUtbgH_NUUJSqHXCxJn4,78
 pycoze/utils/arg.py,sha256=kA3KBQzXc2WlH5XbF8kfikfpqljiKaW7oY_GE4Qyffc,753
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.93.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.93.dist-info/METADATA,sha256=logRR2lLxN2coU_EflW59R7Ra3Nu_HkILqKr7OCwVvU,725
-pycoze-0.1.93.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pycoze-0.1.93.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.93.dist-info/RECORD,,
+pycoze-0.1.95.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.95.dist-info/METADATA,sha256=Iw8qGRdy903gbAX351_zWRMAxj30592JYtZhp1sBqRw,725
+pycoze-0.1.95.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.95.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.95.dist-info/RECORD,,