pycoze 0.1.321__py3-none-any.whl → 0.1.323__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 CHANGED
@@ -267,7 +267,7 @@ class ToolExecutor:
267
267
  elif tool_name in [a.__name__ for a in abilities]:
268
268
  func = [a for a in abilities if a.__name__ == tool_name][0]
269
269
  try:
270
- result = call_func(func, args=(), kwargs=params)
270
+ result = func(**params)
271
271
  except Exception as e:
272
272
  print("Execute tool error:", traceback.format_exc())
273
273
  return False, traceback.format_exc()
pycoze/reference/lib.py CHANGED
@@ -7,14 +7,6 @@ import inspect
7
7
  import asyncio
8
8
 
9
9
  def call_func(func, args=None, kwargs=None):
10
- """
11
- 调用函数并处理普通函数、生成器函数和协程函数。
12
-
13
- :param func: 要调用的函数
14
- :param args: 位置参数(可选)
15
- :param kwargs: 关键字参数(可选)
16
- :return: 函数调用的结果
17
- """
18
10
  if args is None:
19
11
  args = ()
20
12
  if kwargs is None:
@@ -23,8 +15,13 @@ def call_func(func, args=None, kwargs=None):
23
15
  if inspect.isgeneratorfunction(func):
24
16
  return list(func(*args, **kwargs))
25
17
  elif inspect.iscoroutinefunction(func):
26
- loop = asyncio.get_event_loop()
27
- return loop.run_until_complete(func(*args, **kwargs))
18
+ # 确保 func 是协程函数,而不是协程对象
19
+ coro = func(*args, **kwargs) if inspect.iscoroutinefunction(func) else func
20
+ try:
21
+ return asyncio.run(coro)
22
+ except RuntimeError:
23
+ loop = asyncio.get_event_loop()
24
+ return loop.run_until_complete(coro)
28
25
  else:
29
26
  return func(*args, **kwargs)
30
27
 
@@ -82,7 +79,7 @@ def wrapped_func(func, module_path):
82
79
  print(f"called unknown")
83
80
  with ChangeDirectoryAndPath(module_path):
84
81
  try:
85
- result = func(*args, **kwargs)
82
+ result = call_func(func, args, kwargs)
86
83
  except Exception as e:
87
84
  print(f"调用 {func.__name__} 时发生错误: {str(e)}")
88
85
  raise
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: pycoze
3
- Version: 0.1.321
3
+ Version: 0.1.323
4
4
  Summary: Package for pycoze only!
5
5
  Author: Yuan Jie Xiong
6
6
  Author-email: aiqqqqqqq@qq.com
@@ -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=R2GFWPjmgnvjMW24Ur7Fx9muA9tfZtykfERVjge_yiQ,9762
20
+ pycoze/bot/tools.py,sha256=HqfBaJjS9Jg9-MGObD5Iegs8NZsM63DIPbaoMRZR5ms,9737
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=tt6E5h0g3BNfTn74i39fAJzxvSN1l1AX0yXfqAMaLLU,2969
23
+ pycoze/reference/lib.py,sha256=WohkISikBPmdAlyG7zLnFy_F6g-H-N9au8wFeqQpt8o,2939
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.321.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
37
- pycoze-0.1.321.dist-info/METADATA,sha256=8IRFtCrlm2EL8Oo61Bw3SFTYufp7Efq_kdH8gUmyHE4,854
38
- pycoze-0.1.321.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
39
- pycoze-0.1.321.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
40
- pycoze-0.1.321.dist-info/RECORD,,
36
+ pycoze-0.1.323.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
37
+ pycoze-0.1.323.dist-info/METADATA,sha256=yVy3QJTbsRRP4cmsyN7seI61DXfTHIk4iylSmUjPUYI,854
38
+ pycoze-0.1.323.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
39
+ pycoze-0.1.323.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
40
+ pycoze-0.1.323.dist-info/RECORD,,