pycoze 0.1.148__py3-none-any.whl → 0.1.150__py3-none-any.whl

pycoze/bot/agent_chat.py

@@ -0,0 +1,78 @@
+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/bot/bot.py

@@ -1,82 +1,6 @@
-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"]))
+from .agent import INPUT_MESSAGE, output
+from .agent_chat import agent_chat
 
 
 def chat(bot_setting_file: str):

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

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

@@ -3,7 +3,8 @@ pycoze/module.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=QNFul9KZHMuTcTeWe2wbrh9l3tSdtP_o1_KwzD01EOo,3404
+pycoze/bot/agent_chat.py,sha256=Ey45GpBHmzILsMee-iXc90mpiQK3VAm_gomd1tSScOI,2808
+pycoze/bot/bot.py,sha256=XOG47oKoxUiuHjlTbB9-JlT7T22_JhyF1MeAnEPVaiM,725
 pycoze/bot/agent/__init__.py,sha256=YR9vpkEQn1e4937r_xFPJXUCPBEJ0SFzEQDBe2x3-YA,157
 pycoze/bot/agent/agent.py,sha256=Aue8nWeW_I7e1jo4o7cUjFFjrsV9NtVUiTX3EQYHmbA,3507
 pycoze/bot/agent/assistant.py,sha256=3iLxnRvf_ia0cP-FHK5Fv4ylltlnzPq1KscRCFYqjkc,1147
@@ -13,7 +14,7 @@ pycoze/bot/agent/agent_types/const.py,sha256=BfUKPrhAHREoMLHuFNG2bCIEkC1-f7K0LEq
 pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=SnEm5MODHn2uMsaMNqgzULM_91vqLHC0TU6ovwCOqLU,6675
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=6w8LGBFxLygAMR4UUiItUF3AbClnoyDaSoyPK3V-mIg,2205
-pycoze/reference/lib.py,sha256=6l29w22NAPRbL9uq8JtCro8LH3S91kNHU9JEjHBJQBE,2110
+pycoze/reference/lib.py,sha256=0xQJTLTHedGzQBsjuTFNBVqYc4-8Yl65gGCrAhWyOX8,2155
 pycoze/reference/tool.py,sha256=W-XAa2ppIZET99kJcaU9mgYxsxJEKos9ZSUQA8hbqX0,1526
 pycoze/ui/__init__.py,sha256=7xAfL2lfG7-jllPJEZUJO89xUE9sNzvo1y0WmBswjBI,458
 pycoze/ui/base.py,sha256=SCXVDK7PpMaBv6ovvabHcfRq_d2AWM0BRyxpNhuJN5A,1285
@@ -23,8 +24,8 @@ pycoze/ui/ui_def.py,sha256=UhhU_yB3GV9ISbvTWT48hsHPHI250BhMILh6bu5Uioo,4206
 pycoze/utils/__init__.py,sha256=ET0W5wzq4zlY3dr1wHVbbeRKlKdC_zqHt9b0jZyHohw,94
 pycoze/utils/arg.py,sha256=orLVEGw3x2f3l7bZDbBPkkdDPSdqXo-_Rs-4ZhzmrEw,984
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.148.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.148.dist-info/METADATA,sha256=z4ijocIjsHLxvJbiUXnaoA7D6z_TiKQY9sAfHkxcCzY,726
-pycoze-0.1.148.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.148.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.148.dist-info/RECORD,,
+pycoze-0.1.150.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.150.dist-info/METADATA,sha256=IODuOadmykc1AGE47pIeaoMYkRLn_PsJ9kRczQkwlKU,726
+pycoze-0.1.150.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+pycoze-0.1.150.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.150.dist-info/RECORD,,