pycoze 0.1.387__py3-none-any.whl → 0.1.389__py3-none-any.whl

pycoze/api/lib/window.py

@@ -39,7 +39,6 @@ class WindowCls:
     def close_window(self):
         socket.post("closeWindow", {})
 
-
     def get_slected_text(self) -> str:
         result = socket.post_and_recv_result("get-selected-text", {})
         return result

pycoze/bot/chat.py

@@ -12,14 +12,27 @@ from pathlib import Path
 
 
 def eclipse_tool_result(text, threshold=100):
+    if not isinstance(threshold, int) or threshold < 0:
+        return text
+        
     pattern = r'\[Tool Result Begin\](.*?)\[Tool Result End\]'
     
+    # 检查标签是否匹配
+    begin_count = text.count('[Tool Result Begin]')
+    end_count = text.count('[Tool Result End]')
+    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:
+            return match.group(0)  # 返回原始匹配内容，不替换
+            
         if len(content) < threshold:
             return match.group(0)  # 返回原始匹配内容，不替换
         else:
-            return '[Tool Result Begin]...[Tool Result End]'
+            return "[Tool Result Begin]too long to remember...[Tool Result End]"
     
     replaced_text = re.sub(pattern, replace_match, text, flags=re.DOTALL)
     return replaced_text

pycoze/bot/chat_base.py

@@ -19,26 +19,34 @@ def guess_files_in_message(cwd: str, user_message: str) -> List[str]:
         return []
 
 
-def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode: bool):
+def content_str(cwd, potential_paths, conversation_history):
+    content = []
+    for file_path in potential_paths:
+        file_path = resolve_relative_path(cwd, file_path)
+        if os.path.isfile(file_path):
+            file_marker = f"[[{file_path}]]'"
+            file_content = read_local_file(file_path)
+            if not any(
+                file_marker in msg["content"] for msg in conversation_history
+            ):
+                content.append(f"{file_marker}\n{file_content}")
+    return (
+        "Partial contents of files are as follows:" + "\n".join(content)
+        if content
+        else ""
+    )
+
+def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode: bool, opened_files: List[str]):
     if programmer_mode:
         potential_paths = guess_files_in_message(cwd, user_input)
 
         exist_files = get_formatted_filelist_str(cwd, True, 200)
-        content = []
-        for file_path in potential_paths:
-            file_path = resolve_relative_path(cwd, file_path)
-            if os.path.isfile(file_path):
-                file_marker = f"[[{file_path}]]'"
-                file_content = read_local_file(file_path)
-                if not any(
-                    file_marker in msg["content"] for msg in conversation_history
-                ):
-                    content.append(f"{file_marker}\n{file_content}")
-        content_str = (
-            "Partial contents of files are as follows:" + "\n".join(content)
-            if content
-            else ""
+        exist_files_str = f"Files in current directory:\n{exist_files}" if exist_files else ""
+
+        opened_files_str = (
+            f"Opened files:\n{'\n'.join(opened_files)}" if opened_files else ""
         )
+       
         return f"""<task>
 {user_input}
 </task>
@@ -46,10 +54,11 @@ def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode
 <environment_details>
 Current working directory: {cwd}
 
-List of files under path:
-{exist_files}
+{exist_files_str}
 
-{content_str}
+{opened_files_str}
+
+{content_str(cwd, potential_paths, conversation_history)}
 
 </environment_details>
     """
@@ -144,6 +153,7 @@ async def handle_user_inputs(
     no_exit_if_incomplete = bot_setting["systemAbility"]["no_exit_if_incomplete"]
     programmer_mode = bot_setting["programmerMode"]
     show_tool_results = bot_setting["showToolResults"]
+    opened_files = bot_setting["openedFiles"]
 
     start_new_stream = {
         "value": False
@@ -157,7 +167,7 @@ async def handle_user_inputs(
         {
             "role": "user",
             "content": user_task_prompt(
-                conversation_history, cwd, user_input, programmer_mode
+                conversation_history, cwd, user_input, programmer_mode, opened_files
             ),
         }
     )
@@ -219,18 +229,18 @@ async def handle_user_inputs(
                     )
                     
                     assistant_content = (
-                        "Executing tool: "
+                        "Executing tool: \n"
                         + dumps_markdown_json(tool_request)
                         + "\n\n[Tool Result Begin]\n"
                         + result
                         + "\n[Tool Result End]\n"
                     )
                     lang = "json" if is_json_dumps else "text"
-                    status_str = "✅\n" if ok else "❌\n"
+                    
                     if show_tool_results:
+                        status_str = "✅\n" if ok else "❌\n"
                         info("assistant", status_str + f"\n```{lang}\n" + result + "\n```\n\n")
-                    else:
-                        info("assistant", status_str)
+
                     conversation_history.append(
                         {"role": "assistant", "content": assistant_content}
                     )

pycoze/bot/lib.py

@@ -241,4 +241,3 @@ def format_filelist_str(items, limit):
 def get_formatted_filelist_str(root: str, recursive: bool, limit=200):
     items = get_files_and_folders(root, recursive)
     return format_filelist_str(items, limit=limit)
-

{pycoze-0.1.387.dist-info → pycoze-0.1.389.dist-info}/METADATA

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

{pycoze-0.1.387.dist-info → pycoze-0.1.389.dist-info}/RECORD

@@ -9,11 +9,11 @@ pycoze/api/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/api/lib/tab.py,sha256=DWO8ElI-VOODtIxqUFWaDB8VRrrFYAZRWivuIeD1wG0,2619
 pycoze/api/lib/view.py,sha256=_PIpTfeuTPPlMDKshMGsqFQYMq7ZiO4Hg5XwHwDoU60,7357
 pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
-pycoze/api/lib/window.py,sha256=3Qu8AzDwiFK2gBzuSoBkLBXfk0_34343FR3bqa0jjnE,2074
+pycoze/api/lib/window.py,sha256=dkzWfLwn5pE_L0DfQ38K8nx9tQyT5KO-GYyXi0rytFc,2073
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
-pycoze/bot/chat.py,sha256=pLq8RXxXAT43xMPwXwZTSquiX6hlRWjB9PWT_nMxzUw,5807
-pycoze/bot/chat_base.py,sha256=BDwJnirYhd05et-XD5L6Sx0EtDnb0OZ7QojjFpbG-_k,9718
-pycoze/bot/lib.py,sha256=mlNDSO7LwEJYG36h2pagESiEp4_aofv4sdNIe2wyLlQ,7214
+pycoze/bot/chat.py,sha256=4RGMwg2TjFERd-4LTIpQ6ilaRx4eP566KaQma2jg2O4,6296
+pycoze/bot/chat_base.py,sha256=wkmwulx35OWmiNPzwjJ84GitGRj0fCWdA6jkygIowRY,10011
+pycoze/bot/lib.py,sha256=WMVhyKFXvNoLrS2wvNOakIJXyUmVE6ujCV6XVDV0M6A,7213
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
 pycoze/bot/prompt.md,sha256=Km8GzmmC44HN0rnZh8txZxY52_0KWgyKh6GkjGQ3bCI,15379
 pycoze/bot/tools.py,sha256=X5gpYbiRQZMvduhfXZy8VGYwjXGw5ndqbGHb-gXTQIE,10276
@@ -32,8 +32,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.387.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.387.dist-info/METADATA,sha256=qP9IaJUFRo7H940M_k04Uedy-AGs2w8HZXxlwS0d7_U,854
-pycoze-0.1.387.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.387.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.387.dist-info/RECORD,,
+pycoze-0.1.389.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.389.dist-info/METADATA,sha256=saYtER2TJvFDoZVkRqJ8LyZr8skWikf0vq7ZRt5Myng,854
+pycoze-0.1.389.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.389.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.389.dist-info/RECORD,,