pycoze 0.1.99__tar.gz → 0.1.101__tar.gz

{pycoze-0.1.99 → pycoze-0.1.101}/PKG-INFO

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

pycoze-0.1.101/pycoze/access/bot_for_bot.py

@@ -0,0 +1,46 @@
+import sys
+import os
+import importlib
+from langchain.agents import tool as to_agent_tool
+import types
+import langchain_core
+from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_func
+
+
+def import_bot(bot_id):
+    tool_base_path = "../"
+    module_path = os.path.join(tool_base_path, bot_id)
+    module_path = os.path.normpath(os.path.abspath(module_path))
+
+    if not os.path.exists(module_path):
+        print(f"Bot {bot_id} not found")
+        return None
+    
+    try:
+        with ModuleManager(module_path) as manager:
+            bot_setting = module_path + "/botSetting.json"
+            with open(bot_setting, "r", encoding="utf-8") as f:
+                bot_setting = json.load(f)
+            module = importlib.import_module("bot_function")
+            chat_func = getattr(module, "chat")
+            random_name = "bot_" + bot_id[-6:]
+            # 定义函数的内容
+            function_code = f"""
+def {random_name}(command:str) -> str:
+    \"\"\"
+    本函数可以让你与虚拟人角色（{bot_setting["name"]}）进行交互。
+    该函数接收一个指令字符串，并返回虚拟人执行该指令后的结果。
+
+    Args:
+        command: 需要执行的指令字符串。
+
+    Returns:
+        str: 虚拟人执行指令后的结果。
+    \"\"\"
+    return chat_func(command)
+"""
+            
+            return wrapped_func(to_agent_tool(eval(random_name)))
+    except Exception as e:
+        print(f"Error loading bot {bot_id}: {e}")
+        return tool

{pycoze-0.1.99 → pycoze-0.1.101}/pycoze/access/lib.py

@@ -47,7 +47,7 @@ class ModuleManager:
                 del sys.modules[key]
                 
 
-def wrapped_fun(item, module_path):
+def wrapped_func(item, module_path):
     original_tool_function = item.func
 
     def _wrapped(*args, **kwargs):
@@ -57,4 +57,6 @@ def wrapped_fun(item, module_path):
         print(f"{item.name} 调用完毕,结果为:", result)
         return result
 
-    return _wrapped
+    return _wrapped
+
+

{pycoze-0.1.99 → pycoze-0.1.101}/pycoze/access/tool_for_bot.py

@@ -4,7 +4,7 @@ import importlib
 from langchain.agents import tool as to_agent_tool
 import types
 import langchain_core
-from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_fun
+from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_func
 
 
 def import_tools(tool_id):
@@ -35,6 +35,6 @@ def import_tools(tool_id):
         return []
 
     for tool in export_tools:
-        tool.func = wrapped_fun(tool, module_path)
+        tool.func = wrapped_func(tool, module_path)
 
     return export_tools

{pycoze-0.1.99 → pycoze-0.1.101}/pycoze/bot/bot.py

@@ -4,6 +4,7 @@ from .agent import run_agent, Runnable, INPUT_MESSAGE, output
 import asyncio
 from langchain_core.messages import HumanMessage
 from pycoze import utils
+from pycoze.access.bot_for_bot import import_bot
 from pycoze.access.tool_for_bot import import_tools
 from langchain_core.utils.function_calling import convert_to_openai_tool
 
@@ -18,19 +19,23 @@ def load_role_setting(bot_setting_file: str):
         return json.load(f)
 
 
-def load_tools(bot_setting_file: str):
+def load_abilities(bot_setting_file: str):
     with open(bot_setting_file, "r", encoding="utf-8") as f:
         role_setting = json.load(f)
 
-    tools = []
+    abilities = []
+    for bot_id in role_setting["bots"]:
+        bot = import_bot(bot_id)
+        if bot:
+            abilities.append(bot)
     for tool_id in role_setting["tools"]:
-        tools.extend(import_tools(tool_id))
-    return tools
+        abilities.extend(import_tools(tool_id))
+    return abilities
 
 
 def agent_chat(bot_setting_file, history):
     role_setting = load_role_setting(bot_setting_file)
-    tools = load_tools(bot_setting_file)
+    abilities = load_abilities(bot_setting_file)
 
     chat = ChatOpenAI(
         api_key=cfg["apiKey"],
@@ -50,7 +55,7 @@ def agent_chat(bot_setting_file, history):
     if (
         cfg["model"].startswith("deepseek")
         or cfg["toolCompatibilityMode"]
-        and len(tools) > 0
+        and len(abilities) > 0
     ):
         prompt += """
 作为一个AI，你如果不确定结果，请务必使用工具查询。
@@ -62,11 +67,11 @@ def agent_chat(bot_setting_file, history):
 """
         if cfg["model"].startswith("yi-"):
             prompt += "\nAvailable functions:\n"
-            for t in tools:
+            for t in abilities:
                 prompt += f"\n```json\n{json.dumps(convert_to_openai_tool(t))}\n```"
     agent = Runnable(
         agent_execution_mode="FuncCall",
-        tools=tools,
+        tools=abilities,
         llm=chat,
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],

{pycoze-0.1.99 → pycoze-0.1.101}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.99 → pycoze-0.1.101}/setup.py

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

pycoze-0.1.99/pycoze/access/bot_for_bot.py

@@ -1,40 +0,0 @@
-import sys
-import os
-import importlib
-from langchain.agents import tool as to_agent_tool
-import types
-import langchain_core
-from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_fun
-
-
-def import_tools(tool_id):
-    tool_base_path = "../../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_fun(tool, module_path)
-
-    return export_tools