pycoze 0.1.93__tar.gz → 0.1.94__tar.gz

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

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

{pycoze-0.1.93 → pycoze-0.1.94}/pycoze/access/tool_for_bot.py

@@ -6,16 +6,22 @@ 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)
+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 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 __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)
 
 
 def wrapped_tool(tool, module_path):
@@ -24,12 +30,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 +41,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))
 
@@ -51,23 +52,22 @@ def import_tools(tool_id):
     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 ChangeDirectoryAndPath(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
@@ -76,9 +76,7 @@ def import_tools(tool_id):
         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
+    return export_tools

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

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

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

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