pycoze 0.1.318__py3-none-any.whl → 0.1.320__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- pycoze/bot/tools.py +4 -22
- pycoze/reference/lib.py +33 -9
- {pycoze-0.1.318.dist-info → pycoze-0.1.320.dist-info}/METADATA +1 -1
- {pycoze-0.1.318.dist-info → pycoze-0.1.320.dist-info}/RECORD +7 -7
- {pycoze-0.1.318.dist-info → pycoze-0.1.320.dist-info}/LICENSE +0 -0
- {pycoze-0.1.318.dist-info → pycoze-0.1.320.dist-info}/WHEEL +0 -0
- {pycoze-0.1.318.dist-info → pycoze-0.1.320.dist-info}/top_level.txt +0 -0
pycoze/bot/tools.py
CHANGED
@@ -4,29 +4,11 @@ import subprocess
|
|
4
4
|
import fnmatch
|
5
5
|
from typing import Dict
|
6
6
|
from .message import info
|
7
|
-
from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path
|
7
|
+
from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path, call_func
|
8
8
|
from pycoze import ai
|
9
9
|
from pycoze.api import window, web
|
10
10
|
import traceback
|
11
|
-
import inspect
|
12
|
-
import asyncio
|
13
11
|
|
14
|
-
async def handle_async_func(func, params):
|
15
|
-
return await func(**params)
|
16
|
-
|
17
|
-
def handle_generator_func(func, params):
|
18
|
-
return list(func(**params))
|
19
|
-
|
20
|
-
def handle_normal_func(func, params):
|
21
|
-
return func(**params)
|
22
|
-
|
23
|
-
def call_func(func, params):
|
24
|
-
if inspect.isgeneratorfunction(func):
|
25
|
-
return handle_generator_func(func, params)
|
26
|
-
elif inspect.iscoroutinefunction(func):
|
27
|
-
return asyncio.run(handle_async_func(func, params))
|
28
|
-
else:
|
29
|
-
return handle_normal_func(func, params)
|
30
12
|
|
31
13
|
|
32
14
|
class InvalidToolError(Exception):
|
@@ -64,7 +46,7 @@ class ExecuteCommandTool(Tool):
|
|
64
46
|
"confirm",
|
65
47
|
f"Do you want to execute the command{self.params['command']}? ",
|
66
48
|
)
|
67
|
-
if approve
|
49
|
+
if not approve:
|
68
50
|
return "User does not wish to run the command."
|
69
51
|
result = subprocess.run(
|
70
52
|
self.params["command"],
|
@@ -284,9 +266,9 @@ class ToolExecutor:
|
|
284
266
|
elif tool_name in [a.__name__ for a in abilities]:
|
285
267
|
func = [a for a in abilities if a.__name__ == tool_name][0]
|
286
268
|
try:
|
287
|
-
result = call_func(func, params)
|
269
|
+
result = call_func(func, args=(), kwargs=params)
|
288
270
|
except Exception as e:
|
289
|
-
print(traceback.format_exc())
|
271
|
+
print("Execute tool error:", traceback.format_exc())
|
290
272
|
return False, traceback.format_exc()
|
291
273
|
return True, str(result)
|
292
274
|
else:
|
pycoze/reference/lib.py
CHANGED
@@ -3,8 +3,31 @@ import sys
|
|
3
3
|
import importlib
|
4
4
|
import types
|
5
5
|
import functools
|
6
|
+
import inspect
|
7
|
+
import asyncio
|
6
8
|
|
9
|
+
def call_func(func, args=None, kwargs=None):
|
10
|
+
"""
|
11
|
+
调用函数并处理普通函数、生成器函数和协程函数。
|
7
12
|
|
13
|
+
:param func: 要调用的函数
|
14
|
+
:param args: 位置参数(可选)
|
15
|
+
:param kwargs: 关键字参数(可选)
|
16
|
+
:return: 函数调用的结果
|
17
|
+
"""
|
18
|
+
if args is None:
|
19
|
+
args = ()
|
20
|
+
if kwargs is None:
|
21
|
+
kwargs = {}
|
22
|
+
|
23
|
+
if inspect.isgeneratorfunction(func):
|
24
|
+
return list(func(*args, **kwargs))
|
25
|
+
elif inspect.iscoroutinefunction(func):
|
26
|
+
loop = asyncio.get_event_loop()
|
27
|
+
return loop.run_until_complete(func(*args, **kwargs))
|
28
|
+
else:
|
29
|
+
return func(*args, **kwargs)
|
30
|
+
|
8
31
|
class ChangeDirectoryAndPath:
|
9
32
|
"""Context manager to change the current working directory and sys.path."""
|
10
33
|
|
@@ -19,7 +42,8 @@ class ChangeDirectoryAndPath:
|
|
19
42
|
return self
|
20
43
|
|
21
44
|
def __exit__(self, exc_type, exc_value, traceback):
|
22
|
-
sys.path
|
45
|
+
if self.module_path in sys.path:
|
46
|
+
sys.path.remove(self.module_path)
|
23
47
|
os.chdir(self.old_path)
|
24
48
|
|
25
49
|
|
@@ -57,16 +81,16 @@ def wrapped_func(func, module_path):
|
|
57
81
|
except:
|
58
82
|
print(f"called unknown")
|
59
83
|
with ChangeDirectoryAndPath(module_path):
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
84
|
+
try:
|
85
|
+
result = func(*args, **kwargs)
|
86
|
+
except Exception as e:
|
87
|
+
print(f"调用 {func.__name__} 时发生错误: {str(e)}")
|
88
|
+
raise
|
89
|
+
|
90
|
+
print(f"{func.__name__} 调用完毕,结果为:", result)
|
91
|
+
|
67
92
|
return result
|
68
93
|
|
69
94
|
wrapped_function = functools.wraps(func)(_wrapped)
|
70
95
|
return wrapped_function
|
71
96
|
|
72
|
-
|
@@ -17,10 +17,10 @@ pycoze/bot/chat_base.py,sha256=czmOKUum3Rwo4lAOJtfslxaF8RKauWzj26s_WMmQa48,9180
|
|
17
17
|
pycoze/bot/lib.py,sha256=IIihXPODCbM29TlxS0lhm2Fw3GWm2MzUeAn9LGa86lg,6889
|
18
18
|
pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
|
19
19
|
pycoze/bot/prompt.md,sha256=ehjdvZ-se9NaH0OSiDEvrFE9kvdj9MTZlWZUTxPY780,15743
|
20
|
-
pycoze/bot/tools.py,sha256=
|
20
|
+
pycoze/bot/tools.py,sha256=SFRkNaKHepHAfOzMVjJsE1DBh3s_zO3zDTJ8_lFHlqU,9730
|
21
21
|
pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
22
22
|
pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
|
23
|
-
pycoze/reference/lib.py,sha256=
|
23
|
+
pycoze/reference/lib.py,sha256=tt6E5h0g3BNfTn74i39fAJzxvSN1l1AX0yXfqAMaLLU,2969
|
24
24
|
pycoze/reference/tool.py,sha256=h7G3KSoZYWq5IJu6E0-shIQ3XiJeJsgSM85GxEnhF98,1107
|
25
25
|
pycoze/reference/workflow.py,sha256=whQtw_FAxvlSbjow1oNFLdytPjjRs_pDBbQmNjaX6zc,1340
|
26
26
|
pycoze/ui/__init__.py,sha256=uaXet23wUk64TcZjpBX8qOx4aUhwA_ucrmcxy7Q4Qr4,929
|
@@ -33,8 +33,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
|
|
33
33
|
pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
|
34
34
|
pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
|
35
35
|
pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
|
36
|
-
pycoze-0.1.
|
37
|
-
pycoze-0.1.
|
38
|
-
pycoze-0.1.
|
39
|
-
pycoze-0.1.
|
40
|
-
pycoze-0.1.
|
36
|
+
pycoze-0.1.320.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
|
37
|
+
pycoze-0.1.320.dist-info/METADATA,sha256=cmR8iKEXB9qTxJIprbZEbOCkSEgeDYTNJ44mJMyzjuY,854
|
38
|
+
pycoze-0.1.320.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
39
|
+
pycoze-0.1.320.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
|
40
|
+
pycoze-0.1.320.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|