pycoze 0.1.240__py3-none-any.whl → 0.1.241__py3-none-any.whl

pycoze/bot/agent/agent.py

@@ -13,7 +13,7 @@ from langchain_core.agents import AgentFinish
 from .agent_types.const import HumanToolString
 
 
-async def run_agent(agent, inputs: list):
+async def run_agent(agent, inputs: list, tool_compatibility_mode: bool):
     exist_ids = set()
     content_list = []
     async for event in agent.astream_events(inputs, version="v2"):
@@ -29,7 +29,7 @@ async def run_agent(agent, inputs: list):
                     input_list = event["data"]["input"]
                     for msg in input_list:
                         if isinstance(msg, HumanMessage) or isinstance(msg, SystemMessage):
-                            if not msg.content.startswith(HumanToolString):
+                            if not tool_compatibility_mode or not msg.content.startswith(HumanToolString):
                                 content_list = []  # 防止内容重复
                         if isinstance(msg, AIMessage) and not isinstance(
                             msg, AIMessageChunk
@@ -84,6 +84,7 @@ if __name__ == "__main__":
         tools=[python_tool],
         llm=chat,
         assistant_message="请以女友的口吻回答，输出不小于100字，可以随便说点其他的",
+        tool_compatibility_mode=False,
     )
 
     inputs = [HumanMessage(content="计算根号7+根号88")]

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -34,13 +34,48 @@ def get_tools(last_message):
     if "tool_calls" in last_message.additional_kwargs:
         return last_message.additional_kwargs["tool_calls"]
     else:
-        return None
+        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)
+            tool_calls = []
+            for tool_call in all_json:
+                if "name" not in tool_call or "parameters" not in tool_call:
+                    return "end"
+                tool_call["arguments"] = json.dumps(tool_call["parameters"])
+                tool_call.pop("parameters")
+                tool_calls.append(
+                    {
+                        "function": tool_call,
+                        "id": random.randint(0, 1000000),
+                    }
+                )
+        if "<｜tool▁sep｜>" in last_message.content:
+            print("deepseek的bug: <｜tool▁sep｜> 模式")
+            name = (
+                last_message.content.split("<｜tool▁sep｜>")[1].split("```")[0].strip()
+            )
+            all_json = get_all_markdown_json(last_message.content)
+            tool_calls = []
+            for argument in all_json:
+                tool_calls.append(
+                    {
+                        "function": {
+                            "name": name,
+                            "arguments": json.dumps(argument),
+                        },
+                        "id": random.randint(0, 1000000),
+                    }
+                )
+
+        return tool_calls
 
 
 def create_openai_func_call_agent_executor(
     tools: list[BaseTool],
     llm: LanguageModelLike,
     system_message: str,
+    tool_compatibility_mode: str,
     **kwargs
 ):
 
@@ -75,6 +110,8 @@ def create_openai_func_call_agent_executor(
             return 'continue'
         return 'end'
 
+        
+
     # Define the function to execute tools
     async def call_tool(messages):
         actions: list[ToolInvocation] = []
@@ -84,6 +121,14 @@ def create_openai_func_call_agent_executor(
         for tool_call in get_tools(last_message):
             function = tool_call["function"]
             function_name = function["name"]
+            if function_name == "a_delay_function":
+                return [
+                    ToolMessage(
+                        tool_call_id=tool_call["id"],
+                        content="a_delay_function只是一个占位符，请忽略重新调用工具",
+                        additional_kwargs={"name": tool_call["function"]["name"]},
+                    )
+                ]
 
             _tool_input = json.loads(function["arguments"] or "{}")
             # We construct an ToolInvocation from the function_call
@@ -111,7 +156,12 @@ def create_openai_func_call_agent_executor(
                 additional_kwargs={"name": tool_call["function"]["name"]},
             )
             tool_messages.append(message)
-
+        if tool_compatibility_mode:
+            # HumanMessage
+            tool_msgs_str = repr(tool_messages)
+            tool_messages = [
+                HumanMessage(content=HumanToolString + tool_msgs_str)
+            ]
         return tool_messages
 
     workflow = MessageGraph()

pycoze/bot/agent/assistant.py

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

pycoze/bot/agent_chat.py

@@ -1,16 +1,16 @@
 import json
 from langchain_openai import ChatOpenAI
-from .agent import run_agent, Runnable, CHAT_DATA, clear_chat_data
+from .agent import run_agent, Runnable, output, CHAT_DATA, clear_chat_data
 import asyncio
 from pycoze import utils
 from pycoze.reference.bot import ref_bot
 from pycoze.reference.tool import ref_tools
 from pycoze.reference.workflow import ref_workflow
+from langchain_core.utils.function_calling import convert_to_openai_tool
 import os
 
 cfg = utils.read_json_file("llm.json")
 
-
 def load_role_setting(bot_setting_file: str):
     with open(bot_setting_file, "r", encoding="utf-8") as f:
         return json.load(f)
@@ -42,10 +42,10 @@ async def check_interrupt_file(interval, interrupt_file,agent_task):
             agent_task.cancel()
             break 
         
-async def run_with_interrupt_check(agent, history, interrupt_file, check_interval=1):
+async def run_with_interrupt_check(agent, history, tool_compatibility_mode, interrupt_file, check_interval=1):
     clear_chat_data()
     try:
-        agent_task = asyncio.create_task(run_agent(agent, history))
+        agent_task = asyncio.create_task(run_agent(agent, history, tool_compatibility_mode))
         check_task = asyncio.create_task(check_interrupt_file(check_interval, interrupt_file, agent_task))
         result = await agent_task
         return result
@@ -74,25 +74,46 @@ async def agent_chat(bot_setting_file, history):
         api_key=cfg["apiKey"],
         base_url=cfg["baseURL"],
         model=cfg["model"],
-        temperature=(role_setting["temperature"]),
-        # stop_sequences=[
-        #     "tool▁calls▁end",
-        #     "tool▁call▁end",
-        # ],  # 停用deepseek的工具调用标记，不然会虚构工具调用过程和结果
+        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["toolCompatibilityMode"])
+        and len(abilities) > 0
+    ):
+        prompt += """
+作为一个AI，你如果不确定结果，请务必使用工具查询。
+你可以通过下面的方式使用工具，并耐心等待工具返回结果。
+如果你需要调用工具，请使用以正确markdown中的json代码格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
+```json
+{"name": 函数名, "parameters": 参数词典}
+```
+"""
+        if cfg["model"].startswith("yi-"):
+            prompt += "\nAvailable functions:\n"
+            for t in abilities:
+                prompt += f"\n```json\n{json.dumps(convert_to_openai_tool(t))}\n```"
     agent = Runnable(
         agent_execution_mode="FuncCall",
         tools=abilities,
         llm=chat,
         assistant_message=prompt,
+        tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
     params = utils.read_params_file()
     if "interruptFile" in params:
         interrupt_file_path = params["interruptFile"]
-        result = await run_with_interrupt_check(agent, history,interrupt_file_path)
+        result = await run_with_interrupt_check(agent, history, cfg["toolCompatibilityMode"], interrupt_file_path)
     else:
-        result = await run_agent(agent, history)
+        result = await run_agent(agent, history, cfg["toolCompatibilityMode"])
     return result
 

pycoze/bot/bot.py

@@ -1,4 +1,5 @@
 from langchain_core.messages import HumanMessage, AIMessage
+import threading
 import json
 from .agent import INPUT_MESSAGE, output, CHAT_DATA, clear_chat_data
 from .agent_chat import agent_chat

{pycoze-0.1.240.dist-info → pycoze-0.1.241.dist-info}/METADATA

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

{pycoze-0.1.240.dist-info → pycoze-0.1.241.dist-info}/RECORD

@@ -6,15 +6,15 @@ pycoze/ai/llm/chat.py,sha256=izriC7nCp5qeJRqcUVQBVqTHiH6MJS77ROzGBJufdNI,5133
 pycoze/ai/llm/text_to_image_prompt.py,sha256=0bx2C_YRvjAo7iphHGp1-pmGKsKqwur7dM0t3SiA8kA,3398
 pycoze/ai/llm/think.py,sha256=sUgTBdGzcZtL3r-Wx8M3lDuVUmDVz8g3qC0VU8uiKAI,5143
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/agent_chat.py,sha256=Lj7YWG0TrCmdyETnV_NlFL6X6HPkRHEjD3wTFKJah9o,3356
-pycoze/bot/bot.py,sha256=_qmUTZ09FmRLifHrW5stDZWGVK6yuMEMBC3fmeYJnqk,844
+pycoze/bot/agent_chat.py,sha256=jRtPko2OfCkfzSTkJaI62oaBojmkHu-ZUwlZrxCIl8I,4498
+pycoze/bot/bot.py,sha256=fmcgnWcYTFeOxDuAwqWhFhOJzv4mAyJGLqbod-nkhJE,862
 pycoze/bot/agent/__init__.py,sha256=3wE8_FFQS8j2BY-g9Cr-onV0POEvDRZaw_NCzpqrNus,265
-pycoze/bot/agent/agent.py,sha256=iZzvem9_NyFyfu1uvnCxS89SNo2O4Qx1n3CxMIrIy0A,3447
-pycoze/bot/agent/assistant.py,sha256=s1y_gR_9UK_jzjX6YztXK5JNhnV-_YvUA6vv1lToS-k,1083
+pycoze/bot/agent/agent.py,sha256=chUgNZh6v6375L_Y2dBEAaLJyfmw4SygYjVVrDN8VIk,3548
+pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
 pycoze/bot/agent/chat.py,sha256=mubOCAHvA6VtyE6N40elI6KrP6A69uB_G6ihE3G_Vi4,860
 pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7YTqLhpzJC6k,179
 pycoze/bot/agent/agent_types/const.py,sha256=BfUKPrhAHREoMLHuFNG2bCIEkC1-f7K0LEqNg4RwiRE,70
-pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=_R42UdImIjeOJdiiRghRn9A5Cjse9fX3OQTGFNHPr_E,4575
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=SnEm5MODHn2uMsaMNqgzULM_91vqLHC0TU6ovwCOqLU,6675
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=BDflTV3zYoZqWnJpD5lMM_1vU_5b20M3XiFt1p-RHWM,2427
 pycoze/reference/lib.py,sha256=0xQJTLTHedGzQBsjuTFNBVqYc4-8Yl65gGCrAhWyOX8,2155
@@ -29,8 +29,8 @@ pycoze/utils/__init__.py,sha256=Gi5EnrWZGMD2JRejgV4c_VLCXyvA2wwBFI_niDF5MUE,110
 pycoze/utils/arg.py,sha256=GtfGbMTMdaK75Fwh6MpUe1pCA5X6Ep4LFG7a72YrzjI,525
 pycoze/utils/env.py,sha256=W04lhvTHhAAC6EldP6kk2xrctqtu8K6kl1vDLZDNeh8,561
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.240.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.240.dist-info/METADATA,sha256=HUZlCIs52nql_SLc8f5mCsiBNQVzX3rzXR5I8Dy45fo,699
-pycoze-0.1.240.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-pycoze-0.1.240.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.240.dist-info/RECORD,,
+pycoze-0.1.241.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.241.dist-info/METADATA,sha256=eBnfm6cgiBHsRSIf7Il-Lj4oK4R9xAD4b6eu8DyHx8c,699
+pycoze-0.1.241.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+pycoze-0.1.241.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.241.dist-info/RECORD,,