pycoze 0.1.318__py3-none-any.whl → 0.1.320__py3-none-any.whl

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 handle_generator_func(func, params)
-    elif inspect.iscoroutinefunction(func):
-        return asyncio.run(handle_async_func(func, params))
-    else:
-        return handle_normal_func(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,9 +266,9 @@ 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(traceback.format_exc())
+                    print("Execute tool error:", traceback.format_exc())
                     return False, traceback.format_exc()
                 return True, str(result)
             else:

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.318.dist-info → pycoze-0.1.320.dist-info}/METADATA

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

{pycoze-0.1.318.dist-info → pycoze-0.1.320.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=utuQKp5S0XjE7qMhX6_jnpoXBzg4CsiP1rW733QVp0o,10237
+pycoze/bot/tools.py,sha256=SFRkNaKHepHAfOzMVjJsE1DBh3s_zO3zDTJ8_lFHlqU,9730
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
-pycoze/reference/lib.py,sha256=6jvowP2LqjyV21ppRhmtxHxnQJHCbHmlpbj9btV2RQ4,2191
+pycoze/reference/lib.py,sha256=tt6E5h0g3BNfTn74i39fAJzxvSN1l1AX0yXfqAMaLLU,2969
 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.318.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.318.dist-info/METADATA,sha256=agzpVdOKUSQyLvqFKmTlRuY0B-0Fp_iLNQv9w3gRo40,854
-pycoze-0.1.318.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.318.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.318.dist-info/RECORD,,
+pycoze-0.1.320.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.320.dist-info/METADATA,sha256=cmR8iKEXB9qTxJIprbZEbOCkSEgeDYTNJ44mJMyzjuY,854
+pycoze-0.1.320.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.320.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.320.dist-info/RECORD,,