pycoze 0.1.148__tar.gz → 0.1.150__tar.gz

{pycoze-0.1.148 → pycoze-0.1.150}/PKG-INFO

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

pycoze-0.1.148/pycoze/bot/bot.py → pycoze-0.1.150/pycoze/bot/agent_chat.py

@@ -1,97 +1,78 @@
-import json
-from langchain_openai import ChatOpenAI
-from .agent import run_agent, Runnable, INPUT_MESSAGE, output
-import asyncio
-from langchain_core.messages import HumanMessage
-from pycoze import utils
-from pycoze.reference.bot import ref_bot
-from pycoze.reference.tool import ref_tools
-from langchain_core.utils.function_calling import convert_to_openai_tool
-
-params = utils.arg.read_params_file()
-llm_file = params["appPath"] + "/JsonStorage/llm.json"
-with open(llm_file, "r", encoding="utf-8") as f:
-    cfg = json.load(f)
-
-
-def load_role_setting(bot_setting_file: str):
-    with open(bot_setting_file, "r", encoding="utf-8") as f:
-        return json.load(f)
-
-
-def load_abilities(bot_setting_file: str):
-    with open(bot_setting_file, "r", encoding="utf-8") as f:
-        role_setting = json.load(f)
-
-    abilities = []
-    for bot_id in role_setting["bots"]:
-        bot = ref_bot(bot_id, as_agent_tool=True)
-        if bot:
-            abilities.append(bot)
-    for tool_id in role_setting["tools"]:
-        abilities.extend(ref_tools(tool_id, as_agent_tool=True))
-    return abilities
-
-
-def agent_chat(bot_setting_file, history):
-    role_setting = load_role_setting(bot_setting_file)
-    abilities = load_abilities(bot_setting_file)
-
-    chat = ChatOpenAI(
-        api_key=cfg["apiKey"],
-        base_url=cfg["baseURL"],
-        model=cfg["model"],
-        temperature=(
-            role_setting["temperature"] * 2
-            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")
-        or cfg["toolCompatibilityMode"])
-        and len(abilities) > 0
-    ):
-        prompt += """
-作为一个AI，你如果不确定结果，请务必使用工具查询。
-你可以通过下面的方式使用工具，并耐心等待工具返回结果。
-如果你需要调用工具，请使用以正确markdown中的json代码格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
-```json
-{"name": 函数名, "parameters": 参数词典}
-```
-"""
-        if cfg["model"].startswith("yi-"):
-            prompt += "\nAvailable functions:\n"
-            for t in abilities:
-                prompt += f"\n```json\n{json.dumps(convert_to_openai_tool(t))}\n```"
-    agent = Runnable(
-        agent_execution_mode="FuncCall",
-        tools=abilities,
-        llm=chat,
-        assistant_message=prompt,
-        tool_compatibility_mode=cfg["toolCompatibilityMode"],
-    )
-    return asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))
-
-
-def chat(bot_setting_file: str):
-    history = []
-    while True:
-        input_text = input()
-        if not input_text.startswith(INPUT_MESSAGE):
-            raise ValueError("Invalid message")
-        message = json.loads(input_text[len(INPUT_MESSAGE) :])
-        history.append(HumanMessage(message["content"]))
-        result = agent_chat(bot_setting_file, history)
-        history.append(output("assistant", result))
-
-
-def get_chat_response(bot_setting_file: str, input_text: str):
-    history = [HumanMessage(input_text)]
-    result = agent_chat(bot_setting_file, history)
-    return result
+import json
+from langchain_openai import ChatOpenAI
+from .agent import run_agent, Runnable
+import asyncio
+from pycoze import utils
+from pycoze.reference.bot import ref_bot
+from pycoze.reference.tool import ref_tools
+from langchain_core.utils.function_calling import convert_to_openai_tool
+
+params = utils.arg.read_params_file()
+llm_file = params["appPath"] + "/JsonStorage/llm.json"
+with open(llm_file, "r", encoding="utf-8") as f:
+    cfg = json.load(f)
+
+
+def load_role_setting(bot_setting_file: str):
+    with open(bot_setting_file, "r", encoding="utf-8") as f:
+        return json.load(f)
+
+
+def load_abilities(bot_setting_file: str):
+    with open(bot_setting_file, "r", encoding="utf-8") as f:
+        role_setting = json.load(f)
+
+    abilities = []
+    for bot_id in role_setting["bots"]:
+        bot = ref_bot(bot_id, as_agent_tool=True)
+        if bot:
+            abilities.append(bot)
+    for tool_id in role_setting["tools"]:
+        abilities.extend(ref_tools(tool_id, as_agent_tool=True))
+    return abilities
+
+
+def agent_chat(bot_setting_file, history):
+    role_setting = load_role_setting(bot_setting_file)
+    abilities = load_abilities(bot_setting_file)
+
+    chat = ChatOpenAI(
+        api_key=cfg["apiKey"],
+        base_url=cfg["baseURL"],
+        model=cfg["model"],
+        temperature=(
+            role_setting["temperature"] * 2
+            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")
+        or cfg["toolCompatibilityMode"])
+        and len(abilities) > 0
+    ):
+        prompt += """
+作为一个AI，你如果不确定结果，请务必使用工具查询。
+你可以通过下面的方式使用工具，并耐心等待工具返回结果。
+如果你需要调用工具，请使用以正确markdown中的json代码格式进行结尾（务必保证json格式正确，不要出现反斜杠未转义等问题）：
+```json
+{"name": 函数名, "parameters": 参数词典}
+```
+"""
+        if cfg["model"].startswith("yi-"):
+            prompt += "\nAvailable functions:\n"
+            for t in abilities:
+                prompt += f"\n```json\n{json.dumps(convert_to_openai_tool(t))}\n```"
+    agent = Runnable(
+        agent_execution_mode="FuncCall",
+        tools=abilities,
+        llm=chat,
+        assistant_message=prompt,
+        tool_compatibility_mode=cfg["toolCompatibilityMode"],
+    )
+    return asyncio.run(run_agent(agent, history, cfg["toolCompatibilityMode"]))

pycoze-0.1.150/pycoze/bot/bot.py

@@ -0,0 +1,21 @@
+from langchain_core.messages import HumanMessage
+from .agent import INPUT_MESSAGE, output
+from .agent_chat import agent_chat
+
+
+def chat(bot_setting_file: str):
+    history = []
+    while True:
+        input_text = input()
+        if not input_text.startswith(INPUT_MESSAGE):
+            raise ValueError("Invalid message")
+        message = json.loads(input_text[len(INPUT_MESSAGE) :])
+        history.append(HumanMessage(message["content"]))
+        result = agent_chat(bot_setting_file, history)
+        history.append(output("assistant", result))
+
+
+def get_chat_response(bot_setting_file: str, input_text: str):
+    history = [HumanMessage(input_text)]
+    result = agent_chat(bot_setting_file, history)
+    return result

{pycoze-0.1.148 → pycoze-0.1.150}/pycoze/reference/lib.py

@@ -59,7 +59,9 @@ def wrapped_func(item, module_path):
         with ChangeDirectoryAndPath(module_path):
             result = original_tool_function(*args, **kwargs)
         try:
-            print(f"{item.name} 调用完毕,结果:", result, type result, isinstance(result, types.GeneratorType))
+            if isinstance(result, types.GeneratorType):
+                result = list(result)
+            print(f"{item.name} 调用完毕,结果为:", result)
         except:
             pass
         return result

{pycoze-0.1.148 → pycoze-0.1.150}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.148 → pycoze-0.1.150}/pycoze.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ pycoze.egg-info/top_level.txt
 pycoze/ai/__init__.py
 pycoze/ai/vram_reserve.py
 pycoze/bot/__init__.py
+pycoze/bot/agent_chat.py
 pycoze/bot/bot.py
 pycoze/bot/agent/__init__.py
 pycoze/bot/agent/agent.py

{pycoze-0.1.148 → pycoze-0.1.150}/setup.py

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