pycoze 0.1.300__tar.gz → 0.1.302__tar.gz

{pycoze-0.1.300 → pycoze-0.1.302}/PKG-INFO

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

{pycoze-0.1.300 → pycoze-0.1.302}/pycoze/bot/agent_chat.py

@@ -11,23 +11,23 @@ import os
 
 cfg = utils.read_json_file("llm.json")
 
-def load_role_setting(bot_setting_file: str):
+def load_bot_setting(bot_setting_file: str):
     with open(bot_setting_file, "r", encoding="utf-8") as f:
         return json.load(f)
 
 
 def load_abilities(bot_setting_file: str):
     with open(bot_setting_file, "r", encoding="utf-8") as f:
-        role_setting = json.load(f)
+        bot_setting = json.load(f)
 
     abilities = []
-    for bot_id in role_setting["bots"]:
+    for bot_id in bot_setting["bots"]:
         bot = ref_bot(bot_id, as_agent_tool=True)
         if bot:
             abilities.append(bot)
-    for tool_id in role_setting["tools"]:
+    for tool_id in bot_setting["tools"]:
         abilities.extend(ref_tools(tool_id, as_agent_tool=True))
-    for workflow_id in role_setting["workflows"]:
+    for workflow_id in bot_setting["workflows"]:
         workflow = ref_workflow(workflow_id, as_agent_tool=True)
         if workflow:
             abilities.append(workflow)
@@ -67,20 +67,20 @@ async def run_with_interrupt_check(agent, history, tool_compatibility_mode, inte
                 pass  # 忽略取消错误
 
 async def agent_chat(bot_setting_file, history):
-    role_setting = load_role_setting(bot_setting_file)
+    bot_setting = load_bot_setting(bot_setting_file)
     abilities = load_abilities(bot_setting_file)
 
     chat = ChatOpenAI(
         api_key=cfg["apiKey"],
         base_url=cfg["baseURL"],
         model=cfg["model"],
-        temperature=role_setting["temperature"],
+        temperature=bot_setting["temperature"],
         stop_sequences=[
             "tool▁calls▁end",
             "tool▁call▁end",
         ],  # 不然会虚构工具调用过程和结果
     )
-    prompt = role_setting["prompt"]
+    prompt = bot_setting["prompt"]
     if cfg["toolCompatibilityMode"] and len(abilities) > 0:
         prompt += """
 作为一个AI，你如果不确定结果，请务必使用工具查询。

{pycoze-0.1.300 → pycoze-0.1.302}/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-0.1.300 → pycoze-0.1.302}/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-0.1.302/pycoze/reference/tool.py

@@ -0,0 +1,35 @@
+import os
+import importlib
+from .lib import ModuleManager, wrapped_func
+from pycoze import utils
+
+
+params = utils.params
+
+
+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")
+    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")
+
+    except Exception as e:
+        print(f"Error loading tool {tool_id}: {e}")
+        return []
+
+    for tool in export_tools:
+        tool = wrapped_func(tool, module_path)
+        if tool.__doc__ is None:
+            tool.__doc__ = "This tool is used to " + tool.__name__.split("_") + "."
+
+    return [tool.func for tool in export_tools]

pycoze-0.1.302/pycoze/reference/workflow.py

@@ -0,0 +1,45 @@
+import os
+import importlib
+from .lib import ModuleManager, wrapped_func
+from pycoze import utils
+
+
+params = utils.params
+
+
+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")
+    module_path = os.path.join(tool_base_path, workflow_id)
+    module_path = os.path.normpath(os.path.abspath(module_path))
+
+    if not os.path.exists(module_path):
+        print(f"Workflow {workflow_id} not found")
+        return []
+
+    try:
+        with ModuleManager(module_path) as manager:
+            module = importlib.import_module("tool")
+            export_tools = getattr(module, "export_tools")
+
+    except Exception as e:
+        print(f"Error loading workflow {workflow_id}: {e}")
+        return []
+
+    for tool in export_tools:
+        tool = wrapped_func(tool, module_path)
+        if tool.__doc__ is None:
+            tool.__doc__ = "This tool is used to " + tool.__name__.split("_") + "."
+
+    return [tool.func for tool in export_tools]
+
+
+def ref_workflow(workflow_id, workspace_path=None):
+    tools = _ref_workflows(
+        workflow_id, workspace_path=workspace_path
+    )
+    if len(tools) > 0:
+        return tools[0]
+    else:
+        return None

{pycoze-0.1.300 → pycoze-0.1.302}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.300 → pycoze-0.1.302}/setup.py

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

pycoze-0.1.300/pycoze/reference/tool.py

@@ -1,49 +0,0 @@
-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
-
-
-params = utils.params
-
-
-def ref_tools(tool_id, as_agent_tool=False, workspace_path=None):
-    if workspace_path is None:
-        workspace_path = params["workspacePath"]
-    tool_base_path = os.path.join(workspace_path, "User/Local/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 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 + "."
-
-    return export_tools if as_agent_tool else [tool.func for tool in export_tools]

pycoze-0.1.300/pycoze/reference/workflow.py

@@ -1,59 +0,0 @@
-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
-
-
-params = utils.params
-
-
-def _ref_workflows(workflow_id, as_agent_tool=False, workspace_path=None):
-    if workspace_path is None:
-        workspace_path = params["workspacePath"]
-    tool_base_path = os.path.join(workspace_path, "User/Local/workflow")
-    module_path = os.path.join(tool_base_path, workflow_id)
-    module_path = os.path.normpath(os.path.abspath(module_path))
-
-    if not os.path.exists(module_path):
-        print(f"Workflow {workflow_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 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 + "."
-
-    return export_tools if as_agent_tool else [tool.func for tool in export_tools]
-
-
-def ref_workflow(workflow_id, as_agent_tool=False, workspace_path=None):
-    tools = _ref_workflows(
-        workflow_id, as_agent_tool=as_agent_tool, workspace_path=workspace_path
-    )
-    if len(tools) > 0:
-        return tools[0]
-    else:
-        return None