pycoze 0.1.86__tar.gz → 0.1.87__tar.gz

{pycoze-0.1.86 → pycoze-0.1.87}/PKG-INFO

@@ -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 → pycoze-0.1.87}/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-0.1.86 → pycoze-0.1.87}/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-0.1.86 → pycoze-0.1.87}/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-0.1.86 → pycoze-0.1.87}/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 → pycoze-0.1.87}/pycoze.egg-info/PKG-INFO

@@ -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 → pycoze-0.1.87}/setup.py

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