pycoze 0.1.321__py3-none-any.whl → 0.1.323__py3-none-any.whl

pycoze/bot/tools.py

@@ -267,7 +267,7 @@ class ToolExecutor:
             elif tool_name in [a.__name__ for a in abilities]:
                 func = [a for a in abilities if a.__name__ == tool_name][0]
                 try:
-                    result = call_func(func, args=(), kwargs=params)
+                    result = func(**params)
                 except Exception as e:
                     print("Execute tool error:", traceback.format_exc())
                     return False, traceback.format_exc()

pycoze/reference/lib.py

@@ -7,14 +7,6 @@ import inspect
 import asyncio
 
 def call_func(func, args=None, kwargs=None):
-    """
-    调用函数并处理普通函数、生成器函数和协程函数。
-
-    :param func: 要调用的函数
-    :param args: 位置参数（可选）
-    :param kwargs: 关键字参数（可选）
-    :return: 函数调用的结果
-    """
     if args is None:
         args = ()
     if kwargs is None:
@@ -23,8 +15,13 @@ def call_func(func, args=None, kwargs=None):
     if inspect.isgeneratorfunction(func):
         return list(func(*args, **kwargs))
     elif inspect.iscoroutinefunction(func):
-        loop = asyncio.get_event_loop()
-        return loop.run_until_complete(func(*args, **kwargs))
+        # 确保 func 是协程函数，而不是协程对象
+        coro = func(*args, **kwargs) if inspect.iscoroutinefunction(func) else func
+        try:
+            return asyncio.run(coro)
+        except RuntimeError:
+            loop = asyncio.get_event_loop()
+            return loop.run_until_complete(coro)
     else:
         return func(*args, **kwargs)
     
@@ -82,7 +79,7 @@ def wrapped_func(func, module_path):
             print(f"called unknown")
         with ChangeDirectoryAndPath(module_path):
             try:
-                result = func(*args, **kwargs)
+                result = call_func(func, args, kwargs)
             except Exception as e:
                 print(f"调用 {func.__name__} 时发生错误: {str(e)}")
                 raise

{pycoze-0.1.321.dist-info → pycoze-0.1.323.dist-info}/METADATA

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

{pycoze-0.1.321.dist-info → pycoze-0.1.323.dist-info}/RECORD

@@ -17,10 +17,10 @@ pycoze/bot/chat_base.py,sha256=czmOKUum3Rwo4lAOJtfslxaF8RKauWzj26s_WMmQa48,9180
 pycoze/bot/lib.py,sha256=IIihXPODCbM29TlxS0lhm2Fw3GWm2MzUeAn9LGa86lg,6889
 pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
 pycoze/bot/prompt.md,sha256=ehjdvZ-se9NaH0OSiDEvrFE9kvdj9MTZlWZUTxPY780,15743
-pycoze/bot/tools.py,sha256=R2GFWPjmgnvjMW24Ur7Fx9muA9tfZtykfERVjge_yiQ,9762
+pycoze/bot/tools.py,sha256=HqfBaJjS9Jg9-MGObD5Iegs8NZsM63DIPbaoMRZR5ms,9737
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
-pycoze/reference/lib.py,sha256=tt6E5h0g3BNfTn74i39fAJzxvSN1l1AX0yXfqAMaLLU,2969
+pycoze/reference/lib.py,sha256=WohkISikBPmdAlyG7zLnFy_F6g-H-N9au8wFeqQpt8o,2939
 pycoze/reference/tool.py,sha256=h7G3KSoZYWq5IJu6E0-shIQ3XiJeJsgSM85GxEnhF98,1107
 pycoze/reference/workflow.py,sha256=whQtw_FAxvlSbjow1oNFLdytPjjRs_pDBbQmNjaX6zc,1340
 pycoze/ui/__init__.py,sha256=uaXet23wUk64TcZjpBX8qOx4aUhwA_ucrmcxy7Q4Qr4,929
@@ -33,8 +33,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.321.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.321.dist-info/METADATA,sha256=8IRFtCrlm2EL8Oo61Bw3SFTYufp7Efq_kdH8gUmyHE4,854
-pycoze-0.1.321.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.321.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.321.dist-info/RECORD,,
+pycoze-0.1.323.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.323.dist-info/METADATA,sha256=yVy3QJTbsRRP4cmsyN7seI61DXfTHIk4iylSmUjPUYI,854
+pycoze-0.1.323.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.323.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.323.dist-info/RECORD,,