pycoze 0.1.84__py3-none-any.whl → 0.1.86__py3-none-any.whl

pycoze/bot/agent/agent.py

@@ -83,6 +83,7 @@ if __name__ == "__main__":
         tools=[python_tool],
         llm=chat,
         assistant_message="请以女友的口吻回答，输出不小于100字，可以随便说点其他的",
+        support_tools=True,
     )
 
     inputs = [HumanMessage(content="计算根号7+根号88")]

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -4,7 +4,7 @@ import json
 from langchain.tools import BaseTool
 from langchain_core.utils.function_calling import convert_to_openai_tool
 from langchain_core.language_models.base import LanguageModelLike
-from langchain_core.messages import SystemMessage, ToolMessage
+from langchain_core.messages import SystemMessage, ToolMessage, HumanMessage
 from langgraph.graph import END
 from langgraph.graph.message import MessageGraph
 from langgraph.prebuilt import ToolExecutor, ToolInvocation
@@ -31,7 +31,11 @@ def get_all_markdown_json(content):
 
 
 def create_openai_func_call_agent_executor(
-    tools: list[BaseTool], llm: LanguageModelLike, system_message: str, **kwargs
+    tools: list[BaseTool],
+    llm: LanguageModelLike,
+    system_message: str,
+    support_tools: str,
+    **kwargs
 ):
 
     async def _get_messages(messages):
@@ -58,7 +62,6 @@ def create_openai_func_call_agent_executor(
     def should_continue(messages):
         # If there is no FuncCall, then we finish
         last_message = messages[-1]
-        print("last_message", last_message)
         if last_message.content.strip().endswith("```"):
             last_message.content = last_message.content + "\n\n"  # 避免影响阅读
         # if not last_message.tool_calls:
@@ -82,7 +85,6 @@ def create_openai_func_call_agent_executor(
             tool_calls = []
             for tool_call in all_json:
                 if "name" not in tool_call or "parameters" not in tool_call:
-                    print("end")
                     return "end"
                 tool_call["arguments"] = json.dumps(tool_call["parameters"])
                 tool_call.pop("parameters")
@@ -167,44 +169,32 @@ def create_openai_func_call_agent_executor(
                 additional_kwargs={"name": tool_call["function"]["name"]},
             )
             tool_messages.append(message)
+        if not support_tools:
+            # HumanMessage
+            tool_msgs_str = repr(tool_messages)
+            tool_messages = [
+                HumanMessage(content="工具调用结束，结果如下：\n" + tool_msgs_str)
+            ]
         return tool_messages
 
     workflow = MessageGraph()
 
     # Define the two nodes we will cycle between
     workflow.add_node("agent", agent)
-    workflow.add_node("action", call_tool)
+    workflow.add_node("call_tool", call_tool)
 
-    # Set the entrypoint as `agent`
-    # This means that this node is the first one called
     workflow.set_entry_point("agent")
 
-    # We now add a conditional edge
     workflow.add_conditional_edges(
-        # First, we define the start node. We use `agent`.
-        # This means these are the edges taken after the `agent` node is called.
         "agent",
-        # Next, we pass in the function that will determine which node is called next.
         should_continue,
-        # Finally we pass in a mapping.
-        # The keys are strings, and the values are other nodes.
-        # END is a special node marking that the graph should finish.
-        # What will happen is we will call `should_continue`, and then the output of that
-        # will be matched against the keys in this mapping.
-        # Based on which one it matches, that node will then be called.
         {
-            # If `tools`, then we call the tool node.
-            "continue": "action",
-            # Otherwise we finish.
+            "continue": "call_tool",
             "end": END,
         },
     )
 
-    # We now add a normal edge from `tools` to `agent`.
-    # This means that after `tools` is called, `agent` node is called next.
-    workflow.add_edge("action", "agent")
+    # 调用完工具后，再次调用agent
+    workflow.add_edge("call_tool", "agent")
 
-    # Finally, we compile it!
-    # This compiles it into a LangChain Runnable,
-    # meaning you can use it as you would any other runnable
     return workflow.compile()

pycoze/bot/agent/assistant.py

@@ -18,10 +18,11 @@ class Runnable(RunnableBinding):
         tools: Sequence[BaseTool],
         llm: LanguageModelLike,
         assistant_message: str,
+        support_tools: bool
     ) -> None:
 
         agent_executor = create_openai_func_call_agent_executor(
-            tools, llm, assistant_message
+            tools, llm, assistant_message, support_tools
         )
         agent_executor = agent_executor.with_config({"recursion_limit": 50})
         super().__init__(

pycoze/bot/bot.py

@@ -9,6 +9,9 @@ from langchain_core.utils.function_calling import convert_to_openai_tool
 
 params = utils.arg.read_params_file()
 llm_file = params["appPath"] + "/JsonStorage/llm.json"
+with open(llm_file, "r", encoding="utf-8") as f:
+    cfg = json.load(f)
+support_tools = not cfg["model"].startswith("yi-")
 
 
 def load_role_setting(bot_setting_file: str):
@@ -29,28 +32,23 @@ def load_tools(bot_setting_file: str):
 def agent_chat(bot_setting_file, history):
     role_setting = load_role_setting(bot_setting_file)
     tools = load_tools(bot_setting_file)
-    with open(llm_file, "r", encoding="utf-8") as f:
-        cfg = json.load(f)
-        chat = ChatOpenAI(
-            api_key=cfg["apiKey"],
-            base_url=cfg["baseURL"],
-            model=cfg["model"],
-            temperature=(
-                role_setting["temperature"] * 2
-                if cfg["model"].startswith("deepseek") or cfg["model"].startswith("yi-")
-                else role_setting["temperature"]
-            ),
-            stop_sequences=[
-                "tool▁calls▁end",
-                "tool▁call▁end",
-            ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
-        )
+
+    chat = ChatOpenAI(
+        api_key=cfg["apiKey"],
+        base_url=cfg["baseURL"],
+        model=cfg["model"],
+        temperature=(
+            role_setting["temperature"] * 2
+            if cfg["model"].startswith("deepseek")
+            else role_setting["temperature"]
+        ),
+        stop_sequences=[
+            "tool▁calls▁end",
+            "tool▁call▁end",
+        ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
+    )
     prompt = role_setting["prompt"]
-    if (
-        cfg["model"].startswith("deepseek")
-        or cfg["model"].startswith("yi-")
-        and len(tools) > 0
-    ):
+    if cfg["model"].startswith("deepseek") or not support_tools and len(tools) > 0:
         prompt += """
 如果需要调用工具，请使用以正确的json格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
 ```json
@@ -66,6 +64,7 @@ def agent_chat(bot_setting_file, history):
         tools=tools,
         llm=chat,
         assistant_message=prompt,
+        support_tools=support_tools,
     )
     return asyncio.run(run_agent(agent, history))
 

{pycoze-0.1.84.dist-info → pycoze-0.1.86.dist-info}/METADATA

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

{pycoze-0.1.84.dist-info → pycoze-0.1.86.dist-info}/RECORD

@@ -6,13 +6,13 @@ pycoze/ai/__init__.py,sha256=Smivpb8qbRnzWkzKRe2IxsmKP5Dh8EvngDFdkD_DVLo,73
 pycoze/ai/comfyui.py,sha256=u75tZywkuXiOdm7XST2kBAaveJKpPvY_qTQr_TN9sXk,795
 pycoze/ai/vram_reserve.py,sha256=s55Cy-Q5mTq-k5oIPbAFwCfrjatjN0QTjQxW7WBTPZI,5738
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/bot.py,sha256=t5wtxigZO23qVhVrXBNVu1WYc8jBAvbWWBH1QNwmjXU,3006
+pycoze/bot/bot.py,sha256=ccsyiy_knL5pjRLgzhbUU9iXk01GZnNZFCzY3_bxZaQ,2952
 pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
-pycoze/bot/agent/agent.py,sha256=3504Q6IlgNirLma_bLcIxkBjTvmAWSjKzv6da7A6c2Y,3307
-pycoze/bot/agent/assistant.py,sha256=eEcu8aS0m-Kmkv5QttnVeirJrsjqqUJ6iwLZsvwlSMY,1049
+pycoze/bot/agent/agent.py,sha256=EzgV29nAb0Obc2yQaAa0xph2KSyQ5njtNxj9ZkwnVgA,3335
+pycoze/bot/agent/assistant.py,sha256=XHg3oA4plRzWXow9uwuEoNc2xMYZF8tKDfCaBGVadWI,1092
 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=0llTsPAalGBhVoOLAW4YrLEGPp6-I467i-ZfnpnUr6E,8347
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=Bt4qyH3OsJftkluTlSOE0d0UVFYlY4OuXP9HdgarCHo,7505
 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
@@ -21,8 +21,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.84.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.84.dist-info/METADATA,sha256=vFVict4MOpuC5FlPLdPcY0UoACRx4EYmsnm7ZSW6r8Y,719
-pycoze-0.1.84.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pycoze-0.1.84.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.84.dist-info/RECORD,,
+pycoze-0.1.86.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.86.dist-info/METADATA,sha256=pQEipyeUZJ2PZCS7PUubP0gox0b2CMmJwWZk840YVTY,719
+pycoze-0.1.86.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.86.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.86.dist-info/RECORD,,