pycoze 0.1.131__py3-none-any.whl → 0.1.133__py3-none-any.whl

pycoze/access/{bot_for_bot.py → 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/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/bot/agent/agent_types/__init__.py

@@ -1,4 +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]
+__all__ = [create_openai_func_call_agent_executor, HumanToolString]

pycoze/bot/agent/agent_types/const.py

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

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/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/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.dist-info → pycoze-0.1.133.dist-info}/METADATA

@@ -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.dist-info → pycoze-0.1.133.dist-info}/RECORD

@@ -1,19 +1,20 @@
 pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/module.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/access/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/access/bot_for_bot.py,sha256=2F-l2O6S94jL8Jpn83y_rUxs-22uxSQgrSd0-9wdmts,2029
+pycoze/access/bot.py,sha256=eZuXTsZXfHqH7YVkKX4HnjWOx8XgEQbKMHuxZ8aeME8,2032
 pycoze/access/lib.py,sha256=sp3PqvsyE3OjSqgnykyaz_JARwelMGq44NQUU1x7IV4,2045
-pycoze/access/tool_for_bot.py,sha256=mAx3dPbZpU_FWlK6uxoWqHbduuNM_EQU8kBmzEKkccE,1339
+pycoze/access/tool.py,sha256=mAx3dPbZpU_FWlK6uxoWqHbduuNM_EQU8kBmzEKkccE,1339
 pycoze/ai/__init__.py,sha256=odM2lgYSnApxw4AzLV_5AyaxL5_MLfydOSB1VmLGFyA,75
 pycoze/ai/vram_reserve.py,sha256=QbqaA8qv87cnEpOVDMygi0BNMxuhLYwj1UKfR_D5BD4,4340
 pycoze/bot/__init__.py,sha256=6HHMxDQVOyZM9dtSjQm9tjGnhj4h7CixD0JOvEwTi48,41
-pycoze/bot/bot.py,sha256=u56BqzZ5fbpG3ZgciusMQMXZ3g1YZRmJxZ7vEsC1rAw,3354
+pycoze/bot/bot.py,sha256=3vf1ayGbqSY7Sik3MhTRBY4UUZniFx1Julfo-tzQnuc,3370
 pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
-pycoze/bot/agent/agent.py,sha256=XMTO6s8OJpaOnymT8ZUuJxXx2ICZ3r7Ck0pHJqPPFIs,3346
-pycoze/bot/agent/assistant.py,sha256=XI4w-rFfbk3qYE0tWcWoya8dz-3cA-QZ0Sanhl3DbKE,1112
+pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
+pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
 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=klMFym4FVDClpYZPh3AYXkihBVyRkpdWBpZ56IHohZo,6736
+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=SnEm5MODHn2uMsaMNqgzULM_91vqLHC0TU6ovwCOqLU,6675
 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
@@ -22,8 +23,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.131.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.131.dist-info/METADATA,sha256=qaSLZk_SndWeQlXhI9GoN5_jV2sgS4HQcPFk6-QYhOA,726
-pycoze-0.1.131.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pycoze-0.1.131.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.131.dist-info/RECORD,,
+pycoze-0.1.133.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.133.dist-info/METADATA,sha256=CEki2ZAX-36fcKt-NgR4CBZtkJgOfS2KlKnocLepJn0,726
+pycoze-0.1.133.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pycoze-0.1.133.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.133.dist-info/RECORD,,