pycoze 0.1.319__tar.gz → 0.1.320__tar.gz

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

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

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

@@ -4,29 +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
+from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path, call_func
 from pycoze import ai
 from pycoze.api import window, web
 import traceback
-import inspect
-import asyncio
 
-async def handle_async_func(func, params):
-    return await func(**params)
-
-def handle_generator_func(func, params):
-    return list(func(**params))
-
-def handle_normal_func(func, params):
-    return func(**params)
-
-def call_func(func, params):
-    if inspect.isgeneratorfunction(func):
-        return list(func(**params))
-    elif inspect.iscoroutinefunction(func):
-        return asyncio.run(func(**params))
-    else:
-        return func(**params)
 
 
 class InvalidToolError(Exception):
@@ -64,7 +46,7 @@ class ExecuteCommandTool(Tool):
                     "confirm",
                     f"Do you want to execute the command{self.params['command']}? ",
                 )
-                if approve.strip().lower().startswith("n"):
+                if not approve:
                     return "User does not wish to run the command."
             result = subprocess.run(
                 self.params["command"],
@@ -284,7 +266,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, params)
+                    result = call_func(func, args=(), kwargs=params)
                 except Exception as e:
                     print("Execute tool error:", traceback.format_exc())
                     return False, traceback.format_exc()

{pycoze-0.1.319 → pycoze-0.1.320}/pycoze/reference/lib.py

@@ -3,8 +3,31 @@ import sys
 import importlib
 import types
 import functools
+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:
+        kwargs = {}
+
+    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))
+    else:
+        return func(*args, **kwargs)
+    
 class ChangeDirectoryAndPath:
     """Context manager to change the current working directory and sys.path."""
 
@@ -19,7 +42,8 @@ class ChangeDirectoryAndPath:
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
-        sys.path.remove(self.module_path)
+        if self.module_path in sys.path:
+            sys.path.remove(self.module_path)
         os.chdir(self.old_path)
         
 
@@ -57,16 +81,16 @@ def wrapped_func(func, module_path):
         except:
             print(f"called unknown")
         with ChangeDirectoryAndPath(module_path):
-            result = func(*args, **kwargs)
-        try:
-            if isinstance(result, types.GeneratorType):
-                result = list(result)
-            print(f"{func.__name__} 调用完毕,结果为:", result)
-        except:
-            pass
+            try:
+                result = func(*args, **kwargs)
+            except Exception as e:
+                print(f"调用 {func.__name__} 时发生错误: {str(e)}")
+                raise
+        
+        print(f"{func.__name__} 调用完毕,结果为:", result)
+
         return result
     
     wrapped_function = functools.wraps(func)(_wrapped)
     return wrapped_function
 
-

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

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

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

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