pycoze 0.1.335__py3-none-any.whl → 0.1.336__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -206,7 +206,7 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, h
                         )
                         continue
 
-                    ok, result = ToolExecutor.execute_tool(cwd, tool_request, abilities)
+                    ok, is_json_dumps, result = ToolExecutor.execute_tool(cwd, tool_request, abilities)
                     if ok:
                         info("assistant", "✅\n")
                     else:
@@ -217,7 +217,10 @@ async def handle_user_inputs(conversation_history, user_input, cwd, abilities, h
                         + "\n\nResult: "
                         + result
                     )
-                    info("assistant", "```text\n" + result + "\n```\n\n")
+                    if is_json_dumps:
+                        info("assistant", "```json\n" + result + "\n```\n\n")
+                    else:
+                        info("assistant", "```text\n" + result + "\n```\n\n")
                     conversation_history.append(
                         {"role": "assistant", "content": assistant_content}
                     )

pycoze/bot/prompt.md

@@ -188,9 +188,9 @@ def replace_part_of_a_file(path: str, diff: str) -> None:
 >>>>>>> REPLACE
 Example:
 <<<<<<< SEARCH
-int mian(
+int mian() {
 =======
-int main(
+int main() {
 >>>>>>> REPLACE
 
     Returns:

pycoze/bot/tools.py

@@ -2,13 +2,13 @@ import os
 import re
 import subprocess
 import fnmatch
-from typing import Dict
+from typing import Dict, List
 from .message import info
 from .lib import get_formatted_filelist_str, read_local_file, resolve_relative_path
 from pycoze import ai
 from pycoze.api import window, web
 import traceback
-
+import json
 
 
 class InvalidToolError(Exception):
@@ -254,13 +254,13 @@ class ToolExecutor:
     }
 
     @classmethod
-    def execute_tool(cls, cwd:str, tool_request, abilities) -> str:
+    def execute_tool(cls, cwd:str, tool_request, abilities) -> List[bool, bool, any]:
         """执行工具"""
         try:
             tool_name = list(tool_request.keys())[0]
             params = tool_request[tool_name]
             if not tool_name:
-                return False, "Error: Tool type is empty"
+                return False, 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]:
@@ -269,13 +269,17 @@ class ToolExecutor:
                     result = func(**params)
                 except Exception as e:
                     print("Execute tool error:", traceback.format_exc())
-                    return False, traceback.format_exc()
-                return True, str(result)
+                    return False, False, traceback.format_exc()
+                try:
+                    result = json.dumps(result, indent=4)
+                except:
+                    return True, False, str(result)
+                return True, True,str(result)
             else:
-                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."
+                return False, 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 False, "Tool parameter validation failed."
-            return True, tool.execute()
+                return False, False, "Tool parameter validation failed."
+            return True, False, tool.execute()
         except Exception as e:
-            return False, f"Tool execution failed:  {str(e)}"
+            return False, False, f"Tool execution failed:  {str(e)}"

{pycoze-0.1.335.dist-info → pycoze-0.1.336.dist-info}/METADATA

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

{pycoze-0.1.335.dist-info → pycoze-0.1.336.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=s12X8iOZa8MK-5VUd9JfzIA-gLxY80FJfphcfEx3b_s,3414
-pycoze/bot/chat_base.py,sha256=yPskzKHBdbTiNB2E-FUZfTHdxgDxwYa-AeF2cSh6Ids,9242
+pycoze/bot/chat_base.py,sha256=7x1PhprjImWfzItm-1r3pwJyPEvXaQv8OKfqCPUwodw,9403
 pycoze/bot/lib.py,sha256=smigeWuhl8esHE-Y5l_9bpjJkEJ5OqrxTyPcO8JIubM,7224
 pycoze/bot/message.py,sha256=Zq-_k8HztBMOUIs3hbOvWvwHBNopn4UJJBliCROIGcc,718
-pycoze/bot/prompt.md,sha256=XHP8EdtzmnlMbM0xTe5GKnjAIFq7KauUARiNly2atz4,15777
-pycoze/bot/tools.py,sha256=j8l0sXEPn_yjTllHcmYEr_auVDuOicXdDco4bhZVIIA,9694
+pycoze/bot/prompt.md,sha256=OBxwUY6yiwEmusnUHhwixWYByrWX3BpwfxG_Gfas8UM,15783
+pycoze/bot/tools.py,sha256=oInV6JaVzjat9AvSpk7-zQapPR8LzrYR9zIs133ua-s,9931
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=pxHVYo0G3P3YZ--vBYbMEiEyBoxxPwaO5dMTf9WFMSc,2014
 pycoze/reference/lib.py,sha256=ixiexCA6XWAda_G2ZVDSbFqTJmbkTvYLN47-nc5zyFU,3530
@@ -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.335.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.335.dist-info/METADATA,sha256=KZRVSeVzkAJS2p1s4Zu385igwaArfwRH1oKe1BWyWeA,854
-pycoze-0.1.335.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.335.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.335.dist-info/RECORD,,
+pycoze-0.1.336.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.336.dist-info/METADATA,sha256=gt5s7WaW0VCwFrNxgGFARZuU6_PsS0Gk-qyMLyaAac4,854
+pycoze-0.1.336.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.336.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.336.dist-info/RECORD,,