pycoze 0.1.42__py3-none-any.whl → 0.1.44__py3-none-any.whl

pycoze/access/tool_for_bot.py

@@ -1,56 +1,132 @@
+# 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 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
+    old_tool_fun = 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)
+            sys.path.insert(0, module_path)  # 插入到第一个位置
+            os.chdir(module_path)
+            result = old_tool_fun(*args, **kwargs)
         finally:
-            restore_directory_and_path(module_path, old_path)
+            sys.path.remove(module_path)
+            os.chdir(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"
+    print("import_tools")
+    tool_path = "../../tool"
     old_path = os.getcwd()
-    module_path = os.path.join(tool_base_path, tool_id)
+    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 []
 
-    # Save the current sys.modules state
+    # 保存当前的 sys.modules 状态
     original_modules = sys.modules.copy()
 
     try:
-        change_directory_and_path(module_path)
+        sys.path.insert(0, module_path)  # 插入到第一个位置
+        os.chdir(module_path)
         module = importlib.import_module("tool")
         export_tools = getattr(module, "export_tools")
-        valid_tools = []
+        temp_list = []
         for tool in export_tools:
             assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(
                 tool, types.FunctionType
@@ -58,21 +134,23 @@ def import_tools(tool_id):
             if isinstance(tool, types.FunctionType) and not isinstance(
                 tool, langchain_core.tools.StructuredTool
             ):
-                valid_tools.append(_tool(tool))
-        export_tools = valid_tools
+                temp_list.append(_tool(tool))
+        export_tools = temp_list
 
     except Exception as e:
         print(f"Error loading tool {tool_id}: {e}")
-        restore_directory_and_path(module_path, old_path)
+        sys.path.remove(module_path)
+        os.chdir(old_path)
         return []
 
-    # Unload modules and restore sys.modules state
+    # 卸载模块并恢复 sys.modules 状态
     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)
+    sys.path.remove(module_path)
+    os.chdir(old_path)
 
     for tool in export_tools:
         tool.func = wrapped_tool(tool, module_path)

{pycoze-0.1.42.dist-info → pycoze-0.1.44.dist-info}/METADATA

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

{pycoze-0.1.42.dist-info → pycoze-0.1.44.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=dmaMEBCHy0vbYzanFrLg_ZLw60ZMkDCnpHK-K_aUHMo,2652
+pycoze/access/tool_for_bot.py,sha256=3GpIxm87gijqwV0dnYtXPrpOIE1fqx4U5ji3jP6bUwY,5089
 pycoze/bot/__init__.py,sha256=pciDtfcIXda7iFt9uI5Fpm0JKpGBhdXHmJv4966WTVU,21
 pycoze/bot/bot.py,sha256=ijihiXv6etFFQ-NGxtmi0_J7lkgwZir3jbVGUKdFPZ8,2510
 pycoze/bot/agent/__init__.py,sha256=IaYqQCJ3uBor92JdOxI_EY4HtYOHgej8lijr3UrN1Vc,161
@@ -22,8 +22,8 @@ pycoze/ui/ui_def.py,sha256=CNFYH8NC-WYmbceIPpxsRr9H6O006pMKukx7U-BOE1Q,3744
 pycoze/utils/__init__.py,sha256=KExBkotf23dr2NfTEouWke5nJB1q2IuDXgHrmuyd95k,73
 pycoze/utils/arg.py,sha256=rRujm1zKc0XlnNlpIJ6JAAaFiTzDGmL_RliIpSc5OD8,724
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.42.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.42.dist-info/METADATA,sha256=ca4bq5h8DLWoOBCzYXRZvwDm6bGrQQSX4VwmJjI_hU4,719
-pycoze-0.1.42.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pycoze-0.1.42.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.42.dist-info/RECORD,,
+pycoze-0.1.44.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.44.dist-info/METADATA,sha256=6gkRYRPmN5iNx4FcCVJOQRRta3UIDYI6-Yhw1IdjY0o,719
+pycoze-0.1.44.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.44.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.44.dist-info/RECORD,,