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

pycoze/bot/agent/agent.py

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

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -34,7 +34,7 @@ def create_openai_func_call_agent_executor(
     tools: list[BaseTool],
     llm: LanguageModelLike,
     system_message: str,
-    support_tools: str,
+    tool_compatibility_mode: str,
     **kwargs
 ):
 
@@ -169,11 +169,14 @@ def create_openai_func_call_agent_executor(
                 additional_kwargs={"name": tool_call["function"]["name"]},
             )
             tool_messages.append(message)
-        if not support_tools:
+        if tool_compatibility_mode:
             # HumanMessage
             tool_msgs_str = repr(tool_messages)
             tool_messages = [
-                HumanMessage(content="工具调用结束，结果如下：\n" + tool_msgs_str)
+                HumanMessage(
+                    content="The tool call is done, the result is as follows:\n"
+                    + tool_msgs_str
+                )
             ]
         return tool_messages
 

pycoze/bot/agent/assistant.py

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

pycoze/bot/bot.py

@@ -11,7 +11,6 @@ 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):
@@ -48,9 +47,14 @@ def agent_chat(bot_setting_file, history):
         ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
     )
     prompt = role_setting["prompt"]
-    if cfg["model"].startswith("deepseek") or not support_tools and len(tools) > 0:
+    if (
+        cfg["model"].startswith("deepseek")
+        or cfg["toolCompatibilityMode"]
+        and len(tools) > 0
+    ):
         prompt += """
-如果需要调用工具，请使用以正确的json格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
+如果不确定结果，请务必使用工具查询。
+如果需要调用工具，请使用以正确markdown中的json代码格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
 ```json
 {"name": 函数名, "parameters": 参数词典}
 ```
@@ -64,7 +68,7 @@ def agent_chat(bot_setting_file, history):
         tools=tools,
         llm=chat,
         assistant_message=prompt,
-        support_tools=support_tools,
+        tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
     return asyncio.run(run_agent(agent, history))
 

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

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

{pycoze-0.1.86.dist-info → pycoze-0.1.87.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=ccsyiy_knL5pjRLgzhbUU9iXk01GZnNZFCzY3_bxZaQ,2952
+pycoze/bot/bot.py,sha256=w_ddp3IeWryUgIad-_V-SsDzGwYqZXekw5NXbYyXrkk,3041
 pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
-pycoze/bot/agent/agent.py,sha256=EzgV29nAb0Obc2yQaAa0xph2KSyQ5njtNxj9ZkwnVgA,3335
-pycoze/bot/agent/assistant.py,sha256=XHg3oA4plRzWXow9uwuEoNc2xMYZF8tKDfCaBGVadWI,1092
+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=Bt4qyH3OsJftkluTlSOE0d0UVFYlY4OuXP9HdgarCHo,7505
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=bb6zze6lbdiZi9uSim5oWNviGm5sqLOEY6suSP_xyaI,7591
 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.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,,
+pycoze-0.1.87.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.87.dist-info/METADATA,sha256=ilmNEozGi1c7Id-kP6S9J7GiLDQEOS3mvOJKeJIoGn8,719
+pycoze-0.1.87.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.87.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.87.dist-info/RECORD,,