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

pycoze/bot/bot.py

@@ -25,11 +25,11 @@ def load_abilities(bot_setting_file: str):
 
     abilities = []
     for bot_id in role_setting["bots"]:
-        bot = ref_bot(bot_id)
+        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))
+        abilities.extend(ref_tools(tool_id, as_agent_tool=True))
     return abilities
 
 

pycoze/reference/bot.py

@@ -9,7 +9,7 @@ import json
 
 bot_index  = 0
 
-def ref_bot(bot_id):
+def ref_bot(bot_id, as_agent_tool=False):
     global bot_index
     tool_base_path = "../../bot"
     module_path = os.path.join(tool_base_path, bot_id)
@@ -53,7 +53,7 @@ def {random_name}(command:str) -> str:
             tool.func = wrapped_func(tool, module_path)
             if tool.description is None:
                 tool.description = "This tool is used to " + tool.name + "."
-            return tool
+            return tool if as_agent_tool else tool.func
     except Exception as e:
         print(f"Error loading bot {bot_id}: {e}")
         return None

pycoze/reference/lib.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import importlib
+import types
 
 
 class ChangeDirectoryAndPath:
@@ -58,7 +59,7 @@ def wrapped_func(item, module_path):
         with ChangeDirectoryAndPath(module_path):
             result = original_tool_function(*args, **kwargs)
         try:
-            print(f"{item.name} 调用完毕,结果为:", result)
+            print(f"{item.name} 调用完毕,结果:", result, type result, isinstance(result, types.GeneratorType))
         except:
             pass
         return result

pycoze/reference/tool.py

@@ -7,7 +7,7 @@ import langchain_core
 from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_func
 
 
-def ref_tools(tool_id):
+def ref_tools(tool_id, as_agent_tool=False):
     tool_base_path = "../../tool"
     module_path = os.path.join(tool_base_path, tool_id)
     module_path = os.path.normpath(os.path.abspath(module_path))
@@ -39,4 +39,4 @@ def ref_tools(tool_id):
         if tool.description is None:
             tool.description = "This tool is used to " + tool.name + "."
 
-    return export_tools
+    return export_tools if as_agent_tool else [tool.func for tool in export_tools]

{pycoze-0.1.146.dist-info → pycoze-0.1.148.dist-info}/METADATA

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

{pycoze-0.1.146.dist-info → pycoze-0.1.148.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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=uBezgDfi8WOBguTB0oqFigFcB2CbCAU9rdrJrNQgzVE,3364
+pycoze/bot/bot.py,sha256=QNFul9KZHMuTcTeWe2wbrh9l3tSdtP_o1_KwzD01EOo,3404
 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
@@ -12,9 +12,9 @@ pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7
 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/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycoze/reference/bot.py,sha256=UMnDxCe_E3pz77Pw3my1be7SwcrIi9qhQLESZu8Q4M0,2152
-pycoze/reference/lib.py,sha256=sp3PqvsyE3OjSqgnykyaz_JARwelMGq44NQUU1x7IV4,2045
-pycoze/reference/tool.py,sha256=tieFKJkWW65zP4ld5Vtcrz66Is21QOh-XAZD6rs_ol8,1446
+pycoze/reference/bot.py,sha256=6w8LGBFxLygAMR4UUiItUF3AbClnoyDaSoyPK3V-mIg,2205
+pycoze/reference/lib.py,sha256=6l29w22NAPRbL9uq8JtCro8LH3S91kNHU9JEjHBJQBE,2110
+pycoze/reference/tool.py,sha256=W-XAa2ppIZET99kJcaU9mgYxsxJEKos9ZSUQA8hbqX0,1526
 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
@@ -23,8 +23,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.146.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.146.dist-info/METADATA,sha256=kwGock8TR0QWHQbZ8dhcaPc6mjjd43BuPR_s0Q4VY1o,726
-pycoze-0.1.146.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-pycoze-0.1.146.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.146.dist-info/RECORD,,
+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,,