pycoze 0.1.300__py3-none-any.whl → 0.1.301__py3-none-any.whl

pycoze/reference/bot.py

@@ -1,5 +1,4 @@
 import os
-from langchain.agents import tool as to_agent_tool
 from .lib import ModuleManager, wrapped_func
 import json
 from pycoze import utils
@@ -9,7 +8,7 @@ bot_index = 0
 params = utils.params
 
 
-def ref_bot(bot_id, as_agent_tool=False, workspace_path=None):
+def ref_bot(bot_id, workspace_path=None):
     global bot_index
     if workspace_path is None:
         workspace_path = params["workspacePath"]
@@ -51,11 +50,10 @@ def {random_name}(command:str) -> str:
     return result
 """
             exec(function_code)
-            tool = to_agent_tool(eval(random_name))
-            tool.func = wrapped_func(tool, module_path)
-            if tool.description is None:
-                tool.description = "This tool is used to " + tool.name + "."
-            return tool if as_agent_tool else tool.func
+            tool = eval(random_name)
+            tool = wrapped_func(tool, module_path)
+
+            return tool
     except Exception as e:
         print(f"Error loading bot {bot_id}: {e}")
         return None

pycoze/reference/lib.py

@@ -48,20 +48,19 @@ class ModuleManager:
                 del sys.modules[key]
                 
 
-def wrapped_func(item, module_path):
-    original_tool_function = item.func
+def wrapped_func(func, module_path):
 
     def _wrapped(*args, **kwargs):
         try:
-            print(f"调用了 {item.name}")
+            print(f"调用了 {func.__name__}")
         except:
             print(f"called unknown")
         with ChangeDirectoryAndPath(module_path):
-            result = original_tool_function(*args, **kwargs)
+            result = func(*args, **kwargs)
         try:
             if isinstance(result, types.GeneratorType):
                 result = list(result)
-            print(f"{item.name} 调用完毕,结果为:", result)
+            print(f"{func.__name__} 调用完毕,结果为:", result)
         except:
             pass
         return result

pycoze/reference/tool.py

@@ -1,8 +1,5 @@
 import os
 import importlib
-from langchain.agents import tool as to_agent_tool
-import types
-import langchain_core
 from .lib import ModuleManager, wrapped_func
 from pycoze import utils
 
@@ -10,7 +7,7 @@ from pycoze import utils
 params = utils.params
 
 
-def ref_tools(tool_id, as_agent_tool=False, workspace_path=None):
+def ref_tools(tool_id, workspace_path=None):
     if workspace_path is None:
         workspace_path = params["workspacePath"]
     tool_base_path = os.path.join(workspace_path, "User/Local/tool")
@@ -25,25 +22,14 @@ def ref_tools(tool_id, as_agent_tool=False, workspace_path=None):
         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_func(tool, module_path)
-        if tool.description is None:
-            tool.description = "This tool is used to " + tool.name + "."
+        tool = wrapped_func(tool, module_path)
+        if tool.__doc__ is None:
+            tool.__doc__ = "This tool is used to " + tool.name + "."
 
-    return export_tools if as_agent_tool else [tool.func for tool in export_tools]
+    return [tool.func for tool in export_tools]

pycoze/reference/workflow.py

@@ -1,8 +1,5 @@
 import os
 import importlib
-from langchain.agents import tool as to_agent_tool
-import types
-import langchain_core
 from .lib import ModuleManager, wrapped_func
 from pycoze import utils
 
@@ -10,7 +7,7 @@ from pycoze import utils
 params = utils.params
 
 
-def _ref_workflows(workflow_id, as_agent_tool=False, workspace_path=None):
+def _ref_workflows(workflow_id, workspace_path=None):
     if workspace_path is None:
         workspace_path = params["workspacePath"]
     tool_base_path = os.path.join(workspace_path, "User/Local/workflow")
@@ -25,33 +22,22 @@ def _ref_workflows(workflow_id, as_agent_tool=False, workspace_path=None):
         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 workflow {workflow_id}: {e}")
         return []
 
     for tool in export_tools:
-        tool.func = wrapped_func(tool, module_path)
-        if tool.description is None:
-            tool.description = "This tool is used to " + tool.name + "."
+        tool = wrapped_func(tool, module_path)
+        if tool.__doc__ is None:
+            tool.__doc__ = "This tool is used to " + tool.name + "."
 
-    return export_tools if as_agent_tool else [tool.func for tool in export_tools]
+    return [tool.func for tool in export_tools]
 
 
-def ref_workflow(workflow_id, as_agent_tool=False, workspace_path=None):
+def ref_workflow(workflow_id, workspace_path=None):
     tools = _ref_workflows(
-        workflow_id, as_agent_tool=as_agent_tool, workspace_path=workspace_path
+        workflow_id, workspace_path=workspace_path
     )
     if len(tools) > 0:
         return tools[0]

{pycoze-0.1.300.dist-info → pycoze-0.1.301.dist-info}/METADATA

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

{pycoze-0.1.300.dist-info → pycoze-0.1.301.dist-info}/RECORD

@@ -22,10 +22,10 @@ pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7
 pycoze/bot/agent/agent_types/const.py,sha256=BfUKPrhAHREoMLHuFNG2bCIEkC1-f7K0LEqNg4RwiRE,70
 pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=3qOyrddujtJ50W9SbH5bapbVTwjgE_LC2TnYJWUH9yc,6649
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/reference/bot.py,sha256=d5uB0OH1MF3LXGoBAF6vX6y50IV3sOrNi_5hXAHAmGU,2255
-pycoze/reference/lib.py,sha256=0xQJTLTHedGzQBsjuTFNBVqYc4-8Yl65gGCrAhWyOX8,2155
-pycoze/reference/tool.py,sha256=_dggSWn-oC_reB8TuNOPl48Xr-pgwJHF7XmzlIw6lsQ,1714
-pycoze/reference/workflow.py,sha256=22y8yyJgBMcGShBbqKpUGFl2CM9dh646LsM8r-1UKcs,2013
+pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
+pycoze/reference/lib.py,sha256=CCqJFUXy0v9x8A54uDERmKjJQcteWBEGev6sTQQjH-I,2105
+pycoze/reference/tool.py,sha256=wZCP3Ieko0nzWyx_aG-Cqsv9wTedH1WsIpFvP2im7YM,1041
+pycoze/reference/workflow.py,sha256=dgZFVEiTv-YoGp7oljHRDbsfQP1fANgdm34tABOgbOs,1290
 pycoze/ui/__init__.py,sha256=uaXet23wUk64TcZjpBX8qOx4aUhwA_ucrmcxy7Q4Qr4,929
 pycoze/ui/base.py,sha256=bz9mHZwIXA8LErEHTIonH347u6LP7rxV2EADMMjNZos,1081
 pycoze/ui/color.py,sha256=cT9Ib8uNzkOKxyW0IwVj46o4LwdB1xgNCj1_Rou9d_4,854
@@ -36,8 +36,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.300.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.300.dist-info/METADATA,sha256=OklyHT6jeaoC2ViCz9MEgxLmLidrLWPlLA53KMLlhCg,854
-pycoze-0.1.300.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.300.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.300.dist-info/RECORD,,
+pycoze-0.1.301.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.301.dist-info/METADATA,sha256=VkkIT7B6AU3gWBW5n-tlUJeXena8B3CCu-QIFQWGuRA,854
+pycoze-0.1.301.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.301.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.301.dist-info/RECORD,,