pycoze 0.1.440__py3-none-any.whl → 0.1.442__py3-none-any.whl

pycoze/bot/chat.py

@@ -8,7 +8,7 @@ from pycoze import utils
 import tempfile
 import re
 import datetime
-from pathlib import Path
+import atexit
 
 
 def eclipse_tool_result(text, threshold=100):
@@ -78,6 +78,10 @@ async def run_with_interrupt_check(
         check_task = asyncio.create_task(
             check_interrupt_file(0.5, interrupt_file, chat_task)
         )
+        def cleanup():
+            chat_task.cancel()
+            check_task.cancel()
+        atexit.register(cleanup)
         result = await chat_task
         return result
     except asyncio.CancelledError:

pycoze/bot/chat_base.py

@@ -300,8 +300,7 @@ async def handle_user_inputs(
                     )
                     
                     assistant_content = (
-                        "Executing tool: \n"
-                        + dumps_markdown_json(tool_request)
+                        dumps_markdown_json(tool_request)
                         + "\n\n[Tool Result Begin]\n"
                         + result
                         + "\n[Tool Result End]\n"

pycoze/bot/lib.py

@@ -83,6 +83,7 @@ def get_system_prompt(abilities, bot_setting):
         "allow_list_files": False,
         "allow_access_webpage": False,
         "folder_context": bot_setting["folderContext"],
+        "use_draft": bot_setting["useDraft"]
     }
 
     context.update(bot_setting["systemAbility"])

pycoze/bot/prompt.md

@@ -1,5 +1,9 @@
 {{ prompt }}
 
+{% if use_draft %}
+Think step by step, but only keep a minimum draft for each thinking step, with 5 words at most. Return the answer at the end of the response after a separator ####.
+{% endif %}
+
 {% if has_any_tool %}
 ==== Tool Usage
 You have access to a set of tools running on the {{ system }} system that are executed upon user approval. Only one tool can be used per message, and you will receive the result of the tool's execution in the user's response. You progressively use these tools to accomplish tasks, with each tool's usage being based on the outcome of the previous tool.

pycoze/bot/tools.py

@@ -132,17 +132,38 @@ class ReplaceInFileTool(Tool):
         with open(path, "r", encoding="utf-8") as f:
             content = f.read()
 
+        # 初始化成功和失败的计数器
+        success_count = 0
+        failure_count = 0
+        failure_details = []  # 用于记录匹配失败的详细信息
+
         # 处理差异内容
         diff_content = self.params["diff"]
         for diff_block in diff_content.split("<<<<<<< SEARCH")[1:]:
             search, replace = diff_block.split("=======")
             search = search.strip()
             replace = replace.split(">>>>>>> REPLACE")[0].strip()
-            content = content.replace(search, replace, 1)
+            if search in content:
+                content = content.replace(search, replace, 1)
+                success_count += 1
+            else:
+                failure_count += 1
+                # 记录匹配失败的前20个字符
+                failure_details.append(f"Failed to match: '{search[:20]}...'")
 
         with open(path, "w", encoding="utf-8") as f:
             f.write(content)
-        return f"The content of the file {path}  has been replaced successfully."
+
+        # 构建返回结果
+        result = (
+            f"The content of the file {path} has been replaced successfully. "
+            f"Successfully replaced {success_count} occurrences. "
+            f"Failed to replace {failure_count} occurrences."
+        )
+        if failure_details:
+            result += "\nFailure details:\n" + "\n".join(failure_details)
+
+        return result
 
 
 class SearchFilesTool(Tool):

{pycoze-0.1.440.dist-info → pycoze-0.1.442.dist-info}/METADATA

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

{pycoze-0.1.440.dist-info → pycoze-0.1.442.dist-info}/RECORD

@@ -10,12 +10,12 @@ pycoze/api/lib/view.py,sha256=_PIpTfeuTPPlMDKshMGsqFQYMq7ZiO4Hg5XwHwDoU60,7357
 pycoze/api/lib/web.py,sha256=l56koyd7RUzK-4mQE_5W-POyqSD79mvwusIN0rxND-Q,2347
 pycoze/api/lib/window.py,sha256=dkzWfLwn5pE_L0DfQ38K8nx9tQyT5KO-GYyXi0rytFc,2073
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
-pycoze/bot/chat.py,sha256=qEuMxH0cVFU9QSU36FrOsjhRAxtsvOv7CQtuXvM3F6Y,6446
-pycoze/bot/chat_base.py,sha256=uwAVhhvpKHQytJYMsIOHsTThkr45xRehbXF0-kDbvjM,12614
-pycoze/bot/lib.py,sha256=_bQ52mKsWgFGAogFHnmRBJbvK_tPOwsAJ8NqJNMR5K4,7210
+pycoze/bot/chat.py,sha256=bScsMc0hGh2NlvhQxzWEbnA_WXU9JdAJv-rx27SpEB8,6554
+pycoze/bot/chat_base.py,sha256=I_QOB22Ud1HpBDg8kip9AW4stGbbLOrKpZPSMCHEMAE,12567
+pycoze/bot/lib.py,sha256=RivPA2f5fqzqbW6jL0sx9X9pwgFPxwkk8lt62CWvaZo,7255
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
-pycoze/bot/prompt.md,sha256=t7NQdiiNe-jCDVfeVbvTPfq5WK5nF8CxFUQUFMyXJlo,13880
-pycoze/bot/tools.py,sha256=uFvGIQ4VzkiH-TM9U9RenWfYVYyeUv_bP-094hB9rTc,10367
+pycoze/bot/prompt.md,sha256=UtwZ31wFvNtvM9ZTA4BU2yT1Rb-qnUdU3Ny1O37Tt3Q,14077
+pycoze/bot/tools.py,sha256=BWMdwvqLzvcyaW38lzxUWtc0K1V-C_qPSEZ3OKlAQvU,11108
 pycoze/reference/__init__.py,sha256=zgqGqvmA9HaqytEM33B6vi0kQVk8IiCwJaXa22xsFz8,114
 pycoze/reference/bot.py,sha256=UZK24Qm8kpqpwXJy_zNZeTEEDee05luXdSBeUm0NCt0,2029
 pycoze/reference/lib.py,sha256=T-oBOKxkus5dTouc0oDgfRzUyi6aTyY-FF4yX7SzF5M,3755
@@ -31,8 +31,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.440.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.440.dist-info/METADATA,sha256=c-1yayy-SaotLhwt9UK_dm7XGCa9uEhnaSeuGA4Gq10,854
-pycoze-0.1.440.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.440.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.440.dist-info/RECORD,,
+pycoze-0.1.442.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.442.dist-info/METADATA,sha256=j6lqjhDVXZyB9H-3cykwPuOvfKK4AWr5ji9ct9VFpEc,854
+pycoze-0.1.442.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.442.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.442.dist-info/RECORD,,