pycoze 0.1.131__tar.gz → 0.1.133__tar.gz

{pycoze-0.1.131 → pycoze-0.1.133}/PKG-INFO

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

pycoze-0.1.131/pycoze/access/bot_for_bot.py → pycoze-0.1.133/pycoze/access/bot.py

@@ -11,7 +11,7 @@ bot_index  = 0
 
 def import_bot(bot_id):
     global bot_index
-    tool_base_path = "../"
+    tool_base_path = "../../"
     module_path = os.path.join(tool_base_path, bot_id)
     module_path = os.path.normpath(os.path.abspath(module_path))
 

{pycoze-0.1.131 → pycoze-0.1.133}/pycoze/bot/agent/agent.py

@@ -10,9 +10,10 @@ from langchain_core.messages import (
     SystemMessage,
 )
 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"):
@@ -27,10 +28,9 @@ 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
-                        ):
-                            content_list = []
+                        if isinstance(msg, HumanMessage) or isinstance(msg, SystemMessage):
+                            if not tool_compatibility_mode or not msg.content.startswith(HumanToolString):
+                                content_list = [] # 防止内容重复
                         if isinstance(msg, AIMessage) and not isinstance(
                             msg, AIMessageChunk
                         ):
@@ -87,4 +87,4 @@ if __name__ == "__main__":
     )
 
     inputs = [HumanMessage(content="计算根号7+根号88")]
-    print(asyncio.run(run_agent(agent, inputs)))
+    print(asyncio.run(run_agent(agent, inputs, True)))

pycoze-0.1.133/pycoze/bot/agent/agent_types/__init__.py

@@ -0,0 +1,4 @@
+from .openai_func_call_agent import create_openai_func_call_agent_executor
+from .const import HumanToolString
+
+__all__ = [create_openai_func_call_agent_executor, HumanToolString]

pycoze-0.1.133/pycoze/bot/agent/agent_types/const.py

@@ -0,0 +1 @@
+HumanToolString = 'The tool call is done, the result is as follows:\n'

{pycoze-0.1.131 → pycoze-0.1.133}/pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -11,7 +11,7 @@ from langgraph.prebuilt import ToolExecutor, ToolInvocation
 import re
 import json
 import random
-
+from .const import HumanToolString
 
 def get_all_markdown_json(content):
     # Find all markdown json blocks
@@ -160,10 +160,7 @@ def create_openai_func_call_agent_executor(
             # HumanMessage
             tool_msgs_str = repr(tool_messages)
             tool_messages = [
-                HumanMessage(
-                    content="The tool call is done, the result is as follows:\n"
-                    + tool_msgs_str
-                )
+                HumanMessage(content=HumanToolString + tool_msgs_str)
             ]
         return tool_messages
 

{pycoze-0.1.131 → pycoze-0.1.133}/pycoze/bot/agent/assistant.py

@@ -1,35 +1,35 @@
-from typing import Sequence
-from langchain.tools import BaseTool
-from langchain_core.language_models.base import LanguageModelLike
-from langchain_core.runnables import RunnableBinding
-from .agent_types import create_openai_func_call_agent_executor
-
-
-class Runnable(RunnableBinding):
-    agent_execution_mode: str
-    tools: Sequence[BaseTool]
-    llm: LanguageModelLike
-    assistant_message: str
-
-    def __init__(
-        self,
-        *,
-        agent_execution_mode: str,
-        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, tool_compatibility_mode
-        )
-        agent_executor = agent_executor.with_config({"recursion_limit": 50})
-        super().__init__(
-            tools=tools,
-            llm=llm,
-            agent_execution_mode=agent_execution_mode,
-            assistant_message=assistant_message,
-            bound=agent_executor,
-            return_intermediate_steps=True,
-        )
+from typing import Sequence
+from langchain.tools import BaseTool
+from langchain_core.language_models.base import LanguageModelLike
+from langchain_core.runnables import RunnableBinding
+from .agent_types import create_openai_func_call_agent_executor
+
+
+class Runnable(RunnableBinding):
+    agent_execution_mode: str
+    tools: Sequence[BaseTool]
+    llm: LanguageModelLike
+    assistant_message: str
+
+    def __init__(
+        self,
+        *,
+        agent_execution_mode: str,
+        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, tool_compatibility_mode
+        )
+        agent_executor = agent_executor.with_config({"recursion_limit": 50})
+        super().__init__(
+            tools=tools,
+            llm=llm,
+            agent_execution_mode=agent_execution_mode,
+            assistant_message=assistant_message,
+            bound=agent_executor,
+            return_intermediate_steps=True,
+        )

{pycoze-0.1.131 → pycoze-0.1.133}/pycoze/bot/bot.py

@@ -4,8 +4,8 @@ from .agent import run_agent, Runnable, INPUT_MESSAGE, output
 import asyncio
 from langchain_core.messages import HumanMessage
 from pycoze import utils
-from pycoze.access.bot_for_bot import import_bot
-from pycoze.access.tool_for_bot import import_tools
+from pycoze.access.bot import import_bot
+from pycoze.access.tool import import_tools
 from langchain_core.utils.function_calling import convert_to_openai_tool
 
 params = utils.arg.read_params_file()
@@ -53,8 +53,8 @@ def agent_chat(bot_setting_file, history):
     )
     prompt = role_setting["prompt"]
     if (
-        cfg["model"].startswith("deepseek")
-        or cfg["toolCompatibilityMode"]
+        (cfg["model"].startswith("deepseek")
+        or cfg["toolCompatibilityMode"])
         and len(abilities) > 0
     ):
         prompt += """
@@ -76,7 +76,7 @@ def agent_chat(bot_setting_file, history):
         assistant_message=prompt,
         tool_compatibility_mode=cfg["toolCompatibilityMode"],
     )
-    return asyncio.run(run_agent(agent, history))
+    return asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))
 
 
 def chat(bot_setting_file: str):

{pycoze-0.1.131 → pycoze-0.1.133}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.131 → pycoze-0.1.133}/pycoze.egg-info/SOURCES.txt

@@ -8,9 +8,9 @@ pycoze.egg-info/SOURCES.txt
 pycoze.egg-info/dependency_links.txt
 pycoze.egg-info/top_level.txt
 pycoze/access/__init__.py
-pycoze/access/bot_for_bot.py
+pycoze/access/bot.py
 pycoze/access/lib.py
-pycoze/access/tool_for_bot.py
+pycoze/access/tool.py
 pycoze/ai/__init__.py
 pycoze/ai/vram_reserve.py
 pycoze/bot/__init__.py
@@ -20,6 +20,7 @@ pycoze/bot/agent/agent.py
 pycoze/bot/agent/assistant.py
 pycoze/bot/agent/chat.py
 pycoze/bot/agent/agent_types/__init__.py
+pycoze/bot/agent/agent_types/const.py
 pycoze/bot/agent/agent_types/openai_func_call_agent.py
 pycoze/ui/__init__.py
 pycoze/ui/base.py

{pycoze-0.1.131 → pycoze-0.1.133}/setup.py

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

pycoze-0.1.131/pycoze/bot/agent/agent_types/__init__.py

@@ -1,4 +0,0 @@
-from .openai_func_call_agent import create_openai_func_call_agent_executor
-
-
-__all__ = [create_openai_func_call_agent_executor]