pycoze 0.1.320__tar.gz → 0.1.322__tar.gz

{pycoze-0.1.320 → pycoze-0.1.322}/PKG-INFO

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

{pycoze-0.1.320 → pycoze-0.1.322}/pycoze/bot/tools.py

@@ -4,10 +4,11 @@ import subprocess
 import fnmatch
 from typing import Dict
 from .message import info
-from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path, call_func
+from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path
 from pycoze import ai
 from pycoze.api import window, web
 import traceback
+from pycoze.reference.lib import call_func
 
 
 

{pycoze-0.1.320 → pycoze-0.1.322}/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)
     

{pycoze-0.1.320 → pycoze-0.1.322}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.320 → pycoze-0.1.322}/setup.py

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