pycoze 0.1.36__tar.gz → 0.1.38__tar.gz

{pycoze-0.1.36 → pycoze-0.1.38}/PKG-INFO

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

{pycoze-0.1.36 → pycoze-0.1.38}/pycoze/bot/agent/agent.py

@@ -13,10 +13,25 @@ async def run_agent(agent, inputs: list):
         content_list = []
         async for event in agent.astream_events(inputs, version="v2"):
             kind = event["event"]
-            if kind == "on_chat_model_stream":
+            if kind == "on_chain_end":
+                if "data" in event:
+                    if (
+                        "output" in event["data"]
+                        and event["data"]["output"] == "end"
+                        and "input" in event["data"]
+                        and isinstance(event["data"]["input"], list)
+                    ):
+                        input_list = event["data"]["input"]
+                        for msg in input_list:
+                            if isinstance(msg, AIMessage) and not isinstance(
+                                msg, AIMessageChunk
+                            ):
+                                content = msg.content
+                                if content:
+                                    content_list.append(content)
+            elif kind == "on_chat_model_stream":
                 content = event["data"]["chunk"].content
                 if content:
-                    content_list.append(content)
                     info("assistant", content)
             elif kind == "on_chain_start":
                 data = event["data"]
@@ -41,7 +56,7 @@ async def run_agent(agent, inputs: list):
                                 tool = t["function"]["name"]
                                 info("assistant", f"\n[调用工具:{tool}]\n\n")
 
-        return "".join(content_list)
+        return "\n".join(content_list)
     else:
         assert agent.agent_execution_mode == "ReAct"
         inputs_msg = {"input": inputs[-1].content, "chat_history": inputs[:-1]}

{pycoze-0.1.36 → pycoze-0.1.38}/pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -59,8 +59,7 @@ def create_openai_func_call_agent_executor(
         # If there is no FuncCall, then we finish
         last_message = messages[-1]
         if last_message.content.strip().endswith("```"):
-            print("添加末尾换行")
-            last_message.content += "\n\n"  # 避免影响阅读
+            last_message.content = last_message.content + "\n\n"  # 避免影响阅读
         if not last_message.tool_calls:
             if (
                 "接下来我将" in last_message.content

{pycoze-0.1.36 → pycoze-0.1.38}/pycoze/bot/bot.py

@@ -1,12 +1,10 @@
 import json
 from langchain_openai import ChatOpenAI
-from .base import import_tools
 from .agent import run_agent, Runnable, INPUT_MESSAGE, output
 import asyncio
 from langchain_core.messages import HumanMessage
 from pycoze import utils
 
-
 params = utils.arg.read_params()
 llm_file = params["appPath"] + "/JsonStorage/llm.json"
 
@@ -40,15 +38,26 @@ def agent_chat(bot_setting_file, history):
                 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") and len(tools) > 0:
+        prompt += """
+如果需要调用工具，请使用以下面json格式进行结尾：
+```json
+{"name": 函数名, "parameters": 参数词典}
+```
+"""
     agent = Runnable(
         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"],
+        assistant_message=prompt,
     )
     return asyncio.run(run_agent(agent, history))
 

{pycoze-0.1.36 → pycoze-0.1.38}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.36 → pycoze-0.1.38}/pycoze.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ pycoze.egg-info/SOURCES.txt
 pycoze.egg-info/dependency_links.txt
 pycoze.egg-info/top_level.txt
 pycoze/bot/__init__.py
-pycoze/bot/base.py
 pycoze/bot/bot.py
 pycoze/bot/agent/__init__.py
 pycoze/bot/agent/agent.py

{pycoze-0.1.36 → pycoze-0.1.38}/setup.py

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

pycoze-0.1.36/pycoze/bot/base.py

@@ -1,88 +0,0 @@
-import sys
-import os
-import argparse
-import importlib
-from langchain.agents import tool as _tool
-import types
-import langchain_core
-
-
-def wrapped_tool(tool, module_path):
-    old_tool_fun = tool.func
-
-    def _wrapped_tool(*args, **kwargs):
-        print(f"调用了{tool.name}")
-        old_path = os.getcwd()
-        try:
-            sys.path.insert(0, module_path)  # 插入到第一个位置
-            os.chdir(module_path)
-            result = old_tool_fun(*args, **kwargs)
-        finally:
-            sys.path.remove(module_path)
-            os.chdir(old_path)
-        print(f"{tool.name}调用完毕,结果为:", result)
-        return result
-
-    return _wrapped_tool
-
-
-def import_tools(tool_id):
-    tool_path = "../../tool"
-    old_path = os.getcwd()
-    module_path = os.path.join(tool_path, tool_id)
-    module_path = os.path.normpath(os.path.abspath(module_path))
-
-    if not os.path.exists(module_path):
-        print(f"Tool {tool_id} not found")
-        return []
-
-    # 保存当前的 sys.modules 状态
-    original_modules = sys.modules.copy()
-
-    try:
-        sys.path.insert(0, module_path)  # 插入到第一个位置
-        os.chdir(module_path)
-        module = importlib.import_module("tool")
-        export_tools = getattr(module, "export_tools")
-        temp_list = []
-        for tool in export_tools:
-            assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(
-                tool, types.FunctionType
-            ), f"Tool is not a StructuredTool or function: {tool}"
-            if isinstance(tool, types.FunctionType) and not isinstance(
-                tool, langchain_core.tools.StructuredTool
-            ):
-                temp_list.append(_tool(tool))
-        export_tools = temp_list
-
-    except Exception as e:
-        print(f"Error loading tool {tool_id}: {e}")
-        sys.path.remove(module_path)
-        os.chdir(old_path)
-        return []
-
-    # 卸载模块并恢复 sys.modules 状态
-    importlib.invalidate_caches()
-    for key in list(sys.modules.keys()):
-        if key not in original_modules:
-            del sys.modules[key]
-
-    sys.path.remove(module_path)
-    os.chdir(old_path)
-
-    for tool in export_tools:
-        tool.func = wrapped_tool(tool, module_path)
-
-    return export_tools
-
-
-def read_arg(param: str, is_path=False):
-    parser = argparse.ArgumentParser()
-    parser.add_argument(param, nargs="?", help=f"Parameter {param}")
-    args = parser.parse_args()
-    value = getattr(args, param.lstrip("-"))
-    # 如果是路径并且有引号，去掉引号
-    if is_path and value and value.startswith('"') and value.endswith('"'):
-        value = value[1:-1]
-
-    return value