pycoze 0.1.35__py3-none-any.whl → 0.1.37__py3-none-any.whl

pycoze/bot/agent/agent.py

@@ -3,13 +3,12 @@ import json
 from langchain_openai import ChatOpenAI
 from .chat import info
 from .assistant import Runnable
-from langchain_core.messages import  HumanMessage, AIMessage,AIMessageChunk
+from langchain_core.messages import HumanMessage, AIMessage, AIMessageChunk
 from langchain_core.agents import AgentFinish
 
 
-
 async def run_agent(agent, inputs: list):
-    if agent.agent_execution_mode == 'FuncCall':
+    if agent.agent_execution_mode == "FuncCall":
         exist_ids = set()
         content_list = []
         async for event in agent.astream_events(inputs, version="v2"):
@@ -22,9 +21,17 @@ async def run_agent(agent, inputs: list):
             elif kind == "on_chain_start":
                 data = event["data"]
                 if "input" in data:
-                    input_list = data["input"] if isinstance(data["input"], list) else [data["input"]]
+                    input_list = (
+                        data["input"]
+                        if isinstance(data["input"], list)
+                        else [data["input"]]
+                    )
+                    if len(input_list) == 0:
+                        continue
                     msg = input_list[-1]
-                    if isinstance(msg, AIMessage) and not isinstance(msg, AIMessageChunk):
+                    if isinstance(msg, AIMessage) and not isinstance(
+                        msg, AIMessageChunk
+                    ):
                         if "tool_calls" in msg.additional_kwargs:
                             tool_calls = msg.additional_kwargs["tool_calls"]
                             for t in tool_calls:
@@ -32,41 +39,49 @@ async def run_agent(agent, inputs: list):
                                     continue
                                 exist_ids.add(t["id"])
                                 tool = t["function"]["name"]
-                                info("assistant", f"[调用工具:{tool}]")
+                                info("assistant", f"\n[调用工具:{tool}]\n\n")
 
         return "".join(content_list)
     else:
-        assert agent.agent_execution_mode == 'ReAct'
-        inputs_msg = {'input': inputs[-1].content,'chat_history': inputs[:-1]}
+        assert agent.agent_execution_mode == "ReAct"
+        inputs_msg = {"input": inputs[-1].content, "chat_history": inputs[:-1]}
         use_tools = []
         async for event in agent.astream_events(inputs_msg, version="v2"):
             kind = event["event"]
             result = None
             if kind == "on_chain_end":
-                if 'data' in event:
-                    if 'output' in event['data']:
-                        output = event['data']['output']
-                        if 'agent_outcome' in output and "input" in output:
-                            outcome = output['agent_outcome']
+                if "data" in event:
+                    if "output" in event["data"]:
+                        output = event["data"]["output"]
+                        if "agent_outcome" in output and "input" in output:
+                            outcome = output["agent_outcome"]
                             if isinstance(outcome, AgentFinish):
-                                result = outcome.return_values['output']
+                                result = outcome.return_values["output"]
             elif kind == "on_tool_start":
-                use_tools.append(event['name'])
-                info("assistant", f"[调用工具:{use_tools}]")
+                use_tools.append(event["name"])
+                info("assistant", f"\n[调用工具:{use_tools}]\n\n")
         return result
 
 
 if __name__ == "__main__":
     from langchain_experimental.tools import PythonREPLTool
+
     llm_file = r"C:\Users\aiqqq\AppData\Roaming\pycoze\JsonStorage\llm.json"
     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=0)
+        chat = ChatOpenAI(
+            api_key=cfg["apiKey"],
+            base_url=cfg["baseURL"],
+            model=cfg["model"],
+            temperature=0,
+        )
     python_tool = PythonREPLTool()
-    agent = Runnable(agent_execution_mode='FuncCall', # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
-                                               tools=[python_tool],
-                                               llm=chat,
-                                               assistant_message="请以女友的口吻回答，输出不小于100字，可以随便说点其他的",)
+    agent = Runnable(
+        agent_execution_mode="FuncCall",  # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
+        tools=[python_tool],
+        llm=chat,
+        assistant_message="请以女友的口吻回答，输出不小于100字，可以随便说点其他的",
+    )
 
     inputs = [HumanMessage(content="计算根号7+根号88")]
     print(asyncio.run(run_agent(agent, inputs)))

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -8,7 +8,26 @@ from langchain_core.messages import SystemMessage, ToolMessage
 from langgraph.graph import END
 from langgraph.graph.message import MessageGraph
 from langgraph.prebuilt import ToolExecutor, ToolInvocation
-from typing import Any
+import re
+import json
+import random
+
+
+def get_all_markdown_json(content):
+    # Find all markdown json blocks
+    markdown_json_blocks = re.findall(r"```json(.*?)```", content, re.DOTALL)
+    json_list = []
+
+    for block in markdown_json_blocks:
+        try:
+            # Remove any leading/trailing whitespace and parse the JSON
+            json_data = json.loads(block.strip())
+            json_list.append(json_data)
+        except json.JSONDecodeError:
+            # If the block is not valid JSON, skip it
+            continue
+
+    return json_list
 
 
 def create_openai_func_call_agent_executor(
@@ -39,6 +58,69 @@ def create_openai_func_call_agent_executor(
     def should_continue(messages):
         # If there is no FuncCall, then we finish
         last_message = messages[-1]
+        if last_message.content.strip().endswith("```"):
+            print("添加末尾换行")
+            last_message.content += "\n\n"  # 避免影响阅读
+        if not last_message.tool_calls:
+            if (
+                "接下来我将" in last_message.content
+                or "接下来，我将" in last_message.content
+            ):
+                print("deepseek的bug: “接下来我将” 模式，使用a_delay_function骗过llm")
+                last_message.additional_kwargs["tool_calls"] = (
+                    last_message.tool_calls
+                ) = [
+                    {
+                        "function": {"name": "a_delay_function", "arguments": "{}"},
+                        "id": random.randint(0, 1000000),
+                    }
+                ]
+                return "continue"
+            if (
+                '"name"' in last_message.content
+                and '"parameters":' in last_message.content
+            ):
+                print("deepseek的bug: 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),
+                        }
+                    )
+                last_message.tool_calls = tool_calls
+                last_message.additional_kwargs["tool_calls"] = tool_calls
+                return "continue"
+            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),
+                        }
+                    )
+
+                last_message.additional_kwargs["tool_calls"] = tool_calls
+                last_message.tool_calls = tool_calls
+                return "continue"
+
         if not last_message.tool_calls:
             return "end"
         # Otherwise if there is, we continue
@@ -54,6 +136,15 @@ def create_openai_func_call_agent_executor(
         for tool_call in last_message.additional_kwargs["tool_calls"]:
             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
             actions.append(
@@ -68,7 +159,7 @@ def create_openai_func_call_agent_executor(
         tool_messages = [
             ToolMessage(
                 tool_call_id=tool_call["id"],
-                content=response,
+                content="\n\n" + response,
                 additional_kwargs={"name": tool_call["function"]["name"]},
             )
             for tool_call, response in zip(

pycoze/bot/bot.py

@@ -35,11 +35,17 @@ def agent_chat(bot_setting_file, history):
             api_key=cfg["apiKey"],
             base_url=cfg["baseURL"],
             model=cfg["model"],
-            temperature=role_setting["temperature"],
+            temperature=(
+                role_setting["temperature"] * 2
+                if cfg["model"].startswith("deepseek")
+                else role_setting["temperature"]
+            ),
         )
 
     agent = Runnable(
-        agent_execution_mode="FuncCall",  # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
+        agent_execution_mode=(
+            "ReAct" if cfg["model"] in ["command-r"] else "FuncCall"
+        ),  # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
         tools=tools,
         llm=chat,
         assistant_message=role_setting["prompt"],

{pycoze-0.1.35.dist-info → pycoze-0.1.37.dist-info}/METADATA

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

{pycoze-0.1.35.dist-info → pycoze-0.1.37.dist-info}/RECORD

@@ -2,13 +2,13 @@ pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/module.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/bot/__init__.py,sha256=pciDtfcIXda7iFt9uI5Fpm0JKpGBhdXHmJv4966WTVU,21
 pycoze/bot/base.py,sha256=GWYDVGGtiCpk6gv-163cAbDid_IsnMe5jTj7eZUMJQU,2679
-pycoze/bot/bot.py,sha256=45HHv9PmUDHfP0pg5zZi23Io7bCZetJSneTZfFaSjow,1838
+pycoze/bot/bot.py,sha256=RPSlKy9YjKrhrTHiaefqvORXD8PTZ6BC-HOw2w5CcEY,2048
 pycoze/bot/agent/__init__.py,sha256=IaYqQCJ3uBor92JdOxI_EY4HtYOHgej8lijr3UrN1Vc,161
-pycoze/bot/agent/agent.py,sha256=vDbTCorUL6Eh2Az4uzwGsLa3Hp4EPcOkq62JpQXt8-s,3435
+pycoze/bot/agent/agent.py,sha256=hxuNNdSrNUhw6FS7xwT4LWFsAS3adOkdspxibL8oOro,3625
 pycoze/bot/agent/assistant.py,sha256=QLeWaPi415P9jruYOm8qcIbC94cXXAhJYmLTkyC9NTQ,1267
 pycoze/bot/agent/chat.py,sha256=kc0qgcrBSXdiMy49JwThZTV-0PAvzAhiUvbI5ILiSnU,571
 pycoze/bot/agent/agent_types/__init__.py,sha256=W2jTNMLqUMqgCMG0Tw0d8n7WpsbsnIonqaPR-YLegLU,210
-pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=LBCkcPbFHpI9ijrze2X15O-9tXxCbi7IKbJRtrBQjwg,4504
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=BJZCqNlDvEYcsesMDpfqRLC53ErYqrImtSsFIUNIECE,8234
 pycoze/bot/agent/agent_types/react_agent.py,sha256=AnjHwHXVwLAm77ndglJGi4rQhqDGWaLuUfl46uZVSzM,6749
 pycoze/bot/agent/agent_types/react_prompt.py,sha256=jyovokGaPzNIe5bvTRvn0gmsWLx5kpDIPmRwmEMCl-M,2142
 pycoze/gpu/__init__.py,sha256=cuxwDdz2Oo-VcwZ50FtFtEIJXdqoz2el-n0QpSt_NMc,75
@@ -21,8 +21,8 @@ pycoze/ui/ui_def.py,sha256=CNFYH8NC-WYmbceIPpxsRr9H6O006pMKukx7U-BOE1Q,3744
 pycoze/utils/__init__.py,sha256=KExBkotf23dr2NfTEouWke5nJB1q2IuDXgHrmuyd95k,73
 pycoze/utils/arg.py,sha256=rRujm1zKc0XlnNlpIJ6JAAaFiTzDGmL_RliIpSc5OD8,724
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.35.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.35.dist-info/METADATA,sha256=zNyvESPcN0ZDZrIb8r_b50-l8FgGWVSJ33p5WeshqW8,719
-pycoze-0.1.35.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-pycoze-0.1.35.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.35.dist-info/RECORD,,
+pycoze-0.1.37.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.37.dist-info/METADATA,sha256=y1TqI51EycK-8nChh0Koi7v-7yEcDLjkzF9P1p4pvLw,719
+pycoze-0.1.37.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.37.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.37.dist-info/RECORD,,

{pycoze-0.1.35.dist-info → pycoze-0.1.37.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any