pycoze 0.1.481__py3-none-any.whl → 0.1.483__py3-none-any.whl

pycoze/bot/chat.py

@@ -18,21 +18,21 @@ def eclipse_tool_result(text, threshold=100):
     pattern = r'\[Tool Result Begin\](.*?)\[Tool Result End\]'
     
     # 检查标签是否匹配
-    begin_count = text.count('[Tool Result Begin]')
-    end_count = text.count('[Tool Result End]')
+    begin_count = text.count('<ToolResult>')
+    end_count = text.count('</ToolResult>')
     if begin_count != end_count:
         return text
     
     def replace_match(match):
         content = match.group(1)
         # 检查嵌套标签
-        if '[Tool Result Begin]' in content or '[Tool Result End]' in content:
+        if '<ToolResult>' in content or '</ToolResult>' in content:
             return match.group(0)  # 返回原始匹配内容，不替换
             
         if len(content) < threshold:
             return match.group(0)  # 返回原始匹配内容，不替换
         else:
-            return "[Tool Result Begin]too long to remember...[Tool Result End]"
+            return "<ToolResult>too long to remember...</ToolResult>"
     
     replaced_text = re.sub(pattern, replace_match, text, flags=re.DOTALL)
     return replaced_text

pycoze/bot/chat_base.py

@@ -290,7 +290,7 @@ async def handle_user_inputs(
                         conversation_history.append(
                             {
                                 "role": "user",
-                                "content": "Invalid JSON content:" + str(e) + ", you should try again. \n\nWhen the content contains triple backticks ```, they MUST be escaped as @`@`@`@.",
+                                "content": "Invalid JSON content:" + str(e) + ", you should try again. \n\nWhen the content contains markdown code format triple backticks ```, they MUST be escaped as @`@`@`@.",
                             }
                         )
                         start_new_stream["value"] = True
@@ -312,7 +312,7 @@ async def handle_user_inputs(
                         {"role": "assistant", "content": assistant_content}
                     )
                     conversation_history.append(
-                        {"role": "system", "content": "[Tool Result Begin]\n"+ result+ "\n[Tool Result End]"}
+                        {"role": "system", "content": "<ToolResult>\n"+ result+ "\n</ToolResult>"}
                     )
                     if tool_name in ["complete_all_tasks", "ask_follow_up_question"]:
                         need_break = True

pycoze/bot/prompt.md

@@ -108,7 +108,7 @@ def write_or_overwrite_file(path: str, content: str) -> None:
     Parameters:
         path (str): The file path to write, which can be a relative path.
         content (str): The content to write or overwrite into the file. Always provide the full content of the file, do not truncate or omit parts. You must include all sections of the file, even those that haven't been modified! 
-        When the content contains triple backticks ```, they MUST be escaped as @`@`@`@.
+        When the content contains markdown code format triple backticks ```, they MUST be escaped as @`@`@`@.
 
     Returns:
         None
@@ -153,7 +153,7 @@ def replace_part_of_a_file(path: str, diff: str) -> None:
     5. Special Operations:
        * Moving code: Use two SEARCH/REPLACE blocks (one removes from original position, one inserts into new position)
        * Deleting code: Use an empty REPLACE section
-    6. When the REPLACE content contains triple backticks ```, they MUST be escaped as @`@`@`@.
+    6. When the REPLACE content contains markdown code format triple backticks ```, they MUST be escaped as @`@`@`@.
 
     Parameters:
         path (str): The file path to modify.

pycoze/bot/tools.py

@@ -141,7 +141,7 @@ class ReplaceInFileTool(Tool):
         diff_content = self.params["diff"]
         for diff_block in diff_content.split("<<<<<<< SEARCH")[1:]:
             search, replace = diff_block.split("=======")
-            search = search.strip()
+            search = search.strip().replace("@`@`@`@", "```")
             replace = replace.split(">>>>>>> REPLACE")[0].strip().replace("@`@`@`@", "```")
             if search in content:
                 content = content.replace(search, replace, 1)

{pycoze-0.1.481.dist-info → pycoze-0.1.483.dist-info}/METADATA

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

{pycoze-0.1.481.dist-info → pycoze-0.1.483.dist-info}/RECORD

@@ -10,12 +10,12 @@ pycoze/api/lib/view.py,sha256=_PIpTfeuTPPlMDKshMGsqFQYMq7ZiO4Hg5XwHwDoU60,7357
 pycoze/api/lib/web.py,sha256=4HaOV_zYHq6-SSQQIc_O7REnC1asIlXIELxee-pU6zc,2421
 pycoze/api/lib/window.py,sha256=ZZacqnX0fvZUnLUhNVjbbjhBcKkYdi_6E0LswLp1MqM,2071
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
-pycoze/bot/chat.py,sha256=Jzn1kATGZIdayhX-VwPdWzcac7mLM99azC-8ulrHJ6U,6615
-pycoze/bot/chat_base.py,sha256=9GZb605aWzw-dWEM6ZQio88y0Fs_zA2O3nPnWCj-W7c,12784
+pycoze/bot/chat.py,sha256=UjiQeK-7rGmBY1w5EhQCx_-Y9ccHXHY_2F5LQX5NIa8,6582
+pycoze/bot/chat_base.py,sha256=E0zG2Nn18W8Fb8z1umR2GLjpgekJWPDr-nDhSItuLi4,12794
 pycoze/bot/lib.py,sha256=WU4h3B7SG7vh9p9BxhtPlaJ7TkU9VsL3HyCn9hKhWOo,7753
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
-pycoze/bot/prompt.md,sha256=l2RR3F3Zjp3NawJWCbd5cZslLgoq4eBpvppaXlezexU,14313
-pycoze/bot/tools.py,sha256=mbaCXFSTx72d2PaHPTolrJPe6n_9b2GxJ-eP6Mmm-kM,11160
+pycoze/bot/prompt.md,sha256=o5GLslCV_RcUDC3dLP-hkXZaXw-6iV_hMgBwm721XKM,14355
+pycoze/bot/tools.py,sha256=8WgDPi41saEcvBov_S69n0mfGL4qeesdINNRiAcvtJw,11186
 pycoze/reference/__init__.py,sha256=u25FWJnOBWsDRoL8_O4jzW4tkJrHT3Sqp9EGCxUhS3E,211
 pycoze/reference/bot.py,sha256=UZK24Qm8kpqpwXJy_zNZeTEEDee05luXdSBeUm0NCt0,2029
 pycoze/reference/fn.py,sha256=ZXnG2ctbHMgr3quQp-4bpnErIkuT-t2_ToSET5LTLbc,750
@@ -33,8 +33,8 @@ pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/process.py,sha256=U2MURGmxfyWBqdbKfy5UvyV17M40B6HHlNELgWfgrTE,3824
 pycoze/utils/socket.py,sha256=4Wm4LlwdWXC_kAV0NnZbUc0Y3Kc6KRMyFRqSw79u-9w,2468
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.481.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.481.dist-info/METADATA,sha256=52nzN8jToKjQqSKXx5sCcjmZchzNZntAX-zGf234_ig,854
-pycoze-0.1.481.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.481.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.481.dist-info/RECORD,,
+pycoze-0.1.483.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.483.dist-info/METADATA,sha256=X-rN0ahkSoRV0Z2Syl6vnUIbepCTHn1BLQkSkBJopH0,854
+pycoze-0.1.483.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.483.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.483.dist-info/RECORD,,