pycoze 0.1.80__py3-none-any.whl → 0.1.82__py3-none-any.whl

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -150,6 +150,7 @@ def create_openai_func_call_agent_executor(
         # We call the tool_executor and get back a response
         responses = await tool_executor.abatch(actions, **kwargs)
         # We use the response to create a ToolMessage
+        print("call_tool")
         tool_messages = []
         for tool_call, response in zip(
             last_message.additional_kwargs["tool_calls"], responses
@@ -165,6 +166,7 @@ def create_openai_func_call_agent_executor(
                 additional_kwargs={"name": tool_call["function"]["name"]},
             )
             tool_messages.append(message)
+        print(tool_messages)
         return tool_messages
 
     workflow = MessageGraph()

pycoze/bot/bot.py

@@ -5,6 +5,7 @@ import asyncio
 from langchain_core.messages import HumanMessage
 from pycoze import utils
 from pycoze.access.tool_for_bot import import_tools
+from langchain_core.utils.function_calling import convert_to_openai_tool
 
 params = utils.arg.read_params_file()
 llm_file = params["appPath"] + "/JsonStorage/llm.json"
@@ -36,7 +37,7 @@ def agent_chat(bot_setting_file, history):
             model=cfg["model"],
             temperature=(
                 role_setting["temperature"] * 2
-                if cfg["model"].startswith("deepseek")
+                if cfg["model"].startswith("deepseek") or cfg["model"].startswith("yi-")
                 else role_setting["temperature"]
             ),
             stop_sequences=[
@@ -45,15 +46,23 @@ def agent_chat(bot_setting_file, history):
             ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
         )
     prompt = role_setting["prompt"]
-    if cfg["model"].startswith("deepseek") and len(tools) > 0:
+    if (
+        cfg["model"].startswith("deepseek")
+        or cfg["model"].startswith("yi-")
+        and len(tools) > 0
+    ):
         prompt += """
 如果需要调用工具，请使用以正确的json格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
 ```json
 {"name": 函数名, "parameters": 参数词典}
 ```
 """
+        if cfg["model"].startswith("yi-"):
+            prompt += "\nAvailable functions:\n"
+            for t in tools:
+                prompt += f"\n```json\n{json.dumps(convert_to_openai_tool(t))}\n```"
     agent = Runnable(
-        "FuncCall",
+        agent_execution_mode="FuncCall",
         tools=tools,
         llm=chat,
         assistant_message=prompt,

{pycoze-0.1.80.dist-info → pycoze-0.1.82.dist-info}/METADATA

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

{pycoze-0.1.80.dist-info → pycoze-0.1.82.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=_oWYL0ay9kcFOfXVYgiL83YT7QvGighG6SyuFGaS4wg,2607
+pycoze/bot/bot.py,sha256=t5wtxigZO23qVhVrXBNVu1WYc8jBAvbWWBH1QNwmjXU,3006
 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/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=_nhlgmV_158fUEOtvB_R3my7Sz5FnCAhLZ1iuY1okOU,8270
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=tCSlO6e1wh6Dx27hPyKNuhuy6iE5l2X4wIaIR5jTFco,8326
 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.80.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.80.dist-info/METADATA,sha256=m9ZMjtlfWH5bd9cD3dewBIM50XVnNiLn59iKrpbr2IQ,719
-pycoze-0.1.80.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pycoze-0.1.80.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.80.dist-info/RECORD,,
+pycoze-0.1.82.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.82.dist-info/METADATA,sha256=Gxx9h6-SyWv0B18gqcEfnXb_6i2OYmHIiRkXPVsEBcA,719
+pycoze-0.1.82.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.82.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.82.dist-info/RECORD,,