pycoze 0.1.321__tar.gz → 0.1.323__tar.gz

{pycoze-0.1.321 → pycoze-0.1.323}/PKG-INFO

@@ -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 → pycoze-0.1.323}/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-0.1.321 → pycoze-0.1.323}/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 → pycoze-0.1.323}/pycoze.egg-info/PKG-INFO

@@ -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 → pycoze-0.1.323}/setup.py

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