pycoze 0.1.315__py3-none-any.whl → 0.1.317__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -206,14 +206,18 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, b
                         )
                         continue
 
-                    result = ToolExecutor.execute_tool(cwd, tool_request, abilities)
+                    ok, result = ToolExecutor.execute_tool(cwd, tool_request, abilities)
+                    if ok:
+                        info("assistant", "✅\n")
+                    else:
+                        info("assistant", "❌\n")
                     assistant_content = (
                         "Executing tool: "
                         + dumps_markdown_json(tool_request)
                         + "\n\nResult: "
                         + result
                     )
-                    info("assistant", "✅\n```text\n" + result + "\n```\n\n")
+                    info("assistant", "```text\n" + result + "\n```\n\n")
                     conversation_history.append(
                         {"role": "assistant", "content": assistant_content}
                     )

pycoze/bot/tools.py

@@ -8,6 +8,25 @@ from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_p
 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):
@@ -259,21 +278,21 @@ class ToolExecutor:
             tool_name = list(tool_request.keys())[0]
             params = tool_request[tool_name]
             if not tool_name:
-                return "Error: Tool type is empty"
+                return False, "Error: Tool type is empty"
             if tool_name in cls.TOOL_MAP:
                 tool_class = cls.TOOL_MAP[tool_name]
             elif tool_name in [a.__name__ for a in abilities]:
                 func = [a for a in abilities if a.__name__ == tool_name][0]
                 try:
-                    result = func(**params)
+                    result = call_func(func, params)
                 except Exception as e:
-                    return traceback.format_exc()
-                return str(result)
+                    return False, traceback.format_exc()
+                return True, str(result)
             else:
-                return f"Unknown tool: {tool_name}, the first key of output json ({tool_name}) will be recognized as a tool, so do not output other json except for executing tools."
+                return False, f"Unknown tool: {tool_name}, the first key of output json ({tool_name}) will be recognized as a tool, so do not output other json except for executing tools."
             tool = tool_class(params, cwd)
             if not tool.validate():
-                return "Tool parameter validation failed."
-            return tool.execute()
+                return False, "Tool parameter validation failed."
+            return True, tool.execute()
         except Exception as e:
-            return f"Tool execution failed:  {str(e)}"
+            return False, f"Tool execution failed:  {str(e)}"

{pycoze-0.1.315.dist-info → pycoze-0.1.317.dist-info}/METADATA

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

{pycoze-0.1.315.dist-info → pycoze-0.1.317.dist-info}/RECORD

@@ -13,11 +13,11 @@ pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 pycoze/api/lib/window.py,sha256=bTkQCzQZ7i3pYXB70bUSTBNJ9C4TW_X3yMae1VkquGk,1944
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
 pycoze/bot/chat.py,sha256=cYMXFe0hgN0CTcI5BiUtte2eTZwgYLKq1vBDQ-eqB5c,3246
-pycoze/bot/chat_base.py,sha256=9abIhdecSRj4l4skkTzFKxS6_hM1pIr6IM1VqbvarKY,9026
+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=vjRksWfE3IJv405IaDAhdqIsIaB156FUP8HBbcroQRc,9601
+pycoze/bot/tools.py,sha256=GKEkauxP0f7eSD-d2occKcip0swihFV2TAI5xxaPrV8,10187
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
 pycoze/reference/lib.py,sha256=6jvowP2LqjyV21ppRhmtxHxnQJHCbHmlpbj9btV2RQ4,2191
@@ -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.315.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.315.dist-info/METADATA,sha256=CxMG3zlOrleFWI35fXaqfQqEbRBhNABG3bLL05qj14o,854
-pycoze-0.1.315.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.315.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.315.dist-info/RECORD,,
+pycoze-0.1.317.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.317.dist-info/METADATA,sha256=oNdRRbYnG8Wneh6Y_b3SsSubGokqEarNQWs-_bzzZRA,854
+pycoze-0.1.317.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.317.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.317.dist-info/RECORD,,