pycoze 0.1.90__py3-none-any.whl → 0.1.94__py3-none-any.whl

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/bot/agent/agent_types/openai_func_call_agent.py

@@ -30,40 +30,11 @@ def get_all_markdown_json(content):
     return json_list
 
 
-def create_openai_func_call_agent_executor(
-    tools: list[BaseTool],
-    llm: LanguageModelLike,
-    system_message: str,
-    tool_compatibility_mode: str,
-    **kwargs
-):
-
-    async def _get_messages(messages):
-        msgs = []
-        for m in messages:
-            if isinstance(m, ToolMessage):
-                _dict = m.dict()
-                _dict["content"] = str(_dict["content"])
-                m_c = ToolMessage(**_dict)
-                msgs.append(m_c)
-            else:
-                msgs.append(m)
-
-        return [SystemMessage(content=system_message)] + msgs
-
-    if tools:
-        llm_with_tools = llm.bind(tools=[convert_to_openai_tool(t) for t in tools])
+def get_tools(last_message):
+    if "tool_calls" in last_message.additional_kwargs:
+        return last_message.additional_kwargs["tool_calls"]
     else:
-        llm_with_tools = llm
-    agent = _get_messages | llm_with_tools
-    tool_executor = ToolExecutor(tools)
-
-    # Define the function that determines whether to continue or not
-    def should_continue(messages):
-        # If there is no FuncCall, then we finish
-        last_message = messages[-1]
-        if last_message.content.strip().endswith("```"):
-            last_message.content = last_message.content + "\n\n"  # 避免影响阅读
+        tool_calls = None
         if '"name"' in last_message.content and '"parameters":' in last_message.content:
             print("name 和 paremeters 模式")
             all_json = get_all_markdown_json(last_message.content)
@@ -79,9 +50,6 @@ def create_openai_func_call_agent_executor(
                         "id": random.randint(0, 1000000),
                     }
                 )
-            last_message.tool_calls = tool_calls
-            last_message.additional_kwargs["tool_calls"] = tool_calls
-            return "continue"
         if "<｜tool▁sep｜>" in last_message.content:
             print("deepseek的bug: <｜tool▁sep｜> 模式")
             name = (
@@ -100,15 +68,49 @@ def create_openai_func_call_agent_executor(
                     }
                 )
 
-            last_message.additional_kwargs["tool_calls"] = tool_calls
-            last_message.tool_calls = tool_calls
-            return "continue"
+        return tool_calls
+
+
+def create_openai_func_call_agent_executor(
+    tools: list[BaseTool],
+    llm: LanguageModelLike,
+    system_message: str,
+    tool_compatibility_mode: str,
+    **kwargs
+):
+
+    async def _get_messages(messages):
+        msgs = []
+        for m in messages:
+            if isinstance(m, ToolMessage):
+                _dict = m.dict()
+                _dict["content"] = str(_dict["content"])
+                m_c = ToolMessage(**_dict)
+                msgs.append(m_c)
+            else:
+                msgs.append(m)
+
+        return [SystemMessage(content=system_message)] + msgs
+
+    if tools:
+        llm_with_tools = llm.bind(tools=[convert_to_openai_tool(t) for t in tools])
+    else:
+        llm_with_tools = llm
+    agent = _get_messages | llm_with_tools
+    tool_executor = ToolExecutor(tools)
+
+    # Define the function that determines whether to continue or not
+    def should_continue(messages):
+        # If there is no FuncCall, then we finish
+        last_message = messages[-1]
+        if last_message.content.strip().endswith("```"):
+            last_message.content = last_message.content + "\n\n"  # 避免影响阅读
+        tools = get_tools(last_message)
+        if last_message.tool_calls or tools:
+            return 'continue'
+        return 'end'
 
-        if not last_message.tool_calls:
-            return "end"
-        # Otherwise if there is, we continue
-        else:
-            return "continue"
+        
 
     # Define the function to execute tools
     async def call_tool(messages):
@@ -116,7 +118,7 @@ def create_openai_func_call_agent_executor(
         # Based on the continue condition
         # we know the last message involves a FuncCall
         last_message = messages[-1]
-        for tool_call in last_message.additional_kwargs["tool_calls"]:
+        for tool_call in get_tools(last_message):
             function = tool_call["function"]
             function_name = function["name"]
             if function_name == "a_delay_function":
@@ -141,7 +143,7 @@ def create_openai_func_call_agent_executor(
         # We use the response to create a ToolMessage
         tool_messages = []
         for tool_call, response in zip(
-            last_message.additional_kwargs["tool_calls"], responses
+            get_tools(last_message), responses
         ):
             if not isinstance(response, (str, int, float, bool, list, tuple)):
                 response = repr(

pycoze/bot/bot.py

@@ -53,8 +53,9 @@ def agent_chat(bot_setting_file, history):
         and len(tools) > 0
     ):
         prompt += """
-如果不确定结果，请务必使用工具查询。
-如果需要调用工具，请使用以正确markdown中的json代码格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
+作为一个AI，你如果不确定结果，请务必使用工具查询。
+你可以通过下面的方式使用工具，并耐心等待工具返回结果。
+如果你需要调用工具，请使用以正确markdown中的json代码格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
 ```json
 {"name": 函数名, "parameters": 参数词典}
 ```

{pycoze-0.1.90.dist-info → pycoze-0.1.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.90
+Version: 0.1.94
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com
@@ -18,7 +18,7 @@ Package for pycoze only!
 
 
 <!-- For author only -->
-<!-- pip install twine -->
+<!-- pip install twine wheel -->
 
 <!-- 递增setup.py的版本 -->
 <!-- 删除build和dist和pycoze.egg-info文件夹 -->

{pycoze-0.1.90.dist-info → pycoze-0.1.94.dist-info}/RECORD

@@ -1,17 +1,17 @@
 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=Nv6XlxcqaLaMVQNDkpcthlqaSxyfHoOfWiTScQXO22Y,2656
+pycoze/access/tool_for_bot.py,sha256=SbAyQJ9BtuLquVrXnmHJl8t_cdID-AYvdwXQvY67u-Y,2608
 pycoze/ai/__init__.py,sha256=odM2lgYSnApxw4AzLV_5AyaxL5_MLfydOSB1VmLGFyA,75
 pycoze/ai/vram_reserve.py,sha256=QbqaA8qv87cnEpOVDMygi0BNMxuhLYwj1UKfR_D5BD4,4340
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/bot.py,sha256=w_ddp3IeWryUgIad-_V-SsDzGwYqZXekw5NXbYyXrkk,3041
+pycoze/bot/bot.py,sha256=HV2N6Cfuvv5eCCh8bG8Lv6DpDJZ1FrSVrVk8H-zcyCE,3146
 pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
 pycoze/bot/agent/agent.py,sha256=XMTO6s8OJpaOnymT8ZUuJxXx2ICZ3r7Ck0pHJqPPFIs,3346
 pycoze/bot/agent/assistant.py,sha256=XI4w-rFfbk3qYE0tWcWoya8dz-3cA-QZ0Sanhl3DbKE,1112
 pycoze/bot/agent/chat.py,sha256=kc0qgcrBSXdiMy49JwThZTV-0PAvzAhiUvbI5ILiSnU,571
 pycoze/bot/agent/agent_types/__init__.py,sha256=XNvKWq9REE5Wzjm0OZi3CKIQF2UZ9PZkeUuxgFJbrfc,128
-pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=nqyHEZVSqxFlfjraeWJ1up4IGZFZSaZB2rlzhVheKbw,6877
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=klMFym4FVDClpYZPh3AYXkihBVyRkpdWBpZ56IHohZo,6736
 pycoze/ui/__init__.py,sha256=7xAfL2lfG7-jllPJEZUJO89xUE9sNzvo1y0WmBswjBI,458
 pycoze/ui/base.py,sha256=SCXVDK7PpMaBv6ovvabHcfRq_d2AWM0BRyxpNhuJN5A,1285
 pycoze/ui/color.py,sha256=cT9Ib8uNzkOKxyW0IwVj46o4LwdB1xgNCj1_Rou9d_4,854
@@ -20,8 +20,8 @@ pycoze/ui/ui_def.py,sha256=UhhU_yB3GV9ISbvTWT48hsHPHI250BhMILh6bu5Uioo,4206
 pycoze/utils/__init__.py,sha256=TNJhFfY7JYdLlzuP9GvgxfNXUtbgH_NUUJSqHXCxJn4,78
 pycoze/utils/arg.py,sha256=kA3KBQzXc2WlH5XbF8kfikfpqljiKaW7oY_GE4Qyffc,753
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.90.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.90.dist-info/METADATA,sha256=zoj2vDA5bs0HUR12_2UExkLzufmpRv_srUQ2UUu_c2s,719
-pycoze-0.1.90.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pycoze-0.1.90.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.90.dist-info/RECORD,,
+pycoze-0.1.94.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.94.dist-info/METADATA,sha256=jjabhgJm9ZlQmWh0-Y0Xoh9t3BDCBvYRpif09RLi5Vs,725
+pycoze-0.1.94.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.94.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.94.dist-info/RECORD,,