pycoze 0.1.55__tar.gz → 0.1.57__tar.gz

{pycoze-0.1.55 → pycoze-0.1.57}/PKG-INFO

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

{pycoze-0.1.55 → pycoze-0.1.57}/pycoze/bot/agent/agent.py

@@ -3,7 +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,
+    SystemMessage,
+)
 from langchain_core.agents import AgentFinish
 
 
@@ -22,15 +27,17 @@ async def run_agent(agent, inputs: list):
                         and isinstance(event["data"]["input"], list)
                     ):
                         input_list = event["data"]["input"]
-                        print("input_list", input_list)
                         for msg in input_list:
+                            if isinstance(msg, HumanMessage) or isinstance(
+                                msg, SystemMessage
+                            ):
+                                content_list = []
                             if isinstance(msg, AIMessage) and not isinstance(
                                 msg, AIMessageChunk
                             ):
                                 content = msg.content
                                 if content:
-                                    # content_list.append(content)
-                                    content_list = [content]
+                                    content_list.append(content)
             elif kind == "on_chat_model_stream":
                 content = event["data"]["chunk"].content
                 if content:

{pycoze-0.1.55 → pycoze-0.1.57}/pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -60,65 +60,60 @@ def create_openai_func_call_agent_executor(
         last_message = messages[-1]
         if last_message.content.strip().endswith("```"):
             last_message.content = 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()
+        # 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),
+                    }
                 )
-                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"
+            last_message.additional_kwargs["tool_calls"] = tool_calls
+            last_message.tool_calls = tool_calls
+            return "continue"
 
         if not last_message.tool_calls:
             return "end"

{pycoze-0.1.55 → pycoze-0.1.57}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.55 → pycoze-0.1.57}/setup.py

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