pycoze 0.1.388__py3-none-any.whl → 0.1.390__py3-none-any.whl

pycoze/bot/chat_base.py

@@ -19,32 +19,35 @@ 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, opened_files: List[str]):
+def format_content(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 generate_user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode: bool, active_file:str, 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)
-        exist_files_str = f"Files in current directory:\n{exist_files}" if exist_files else ""
+        existing_files = get_formatted_filelist_str(cwd, True, 200)
 
-        opened_files_str = (
-            f"Opened files:\n{'\n'.join(opened_files)}" if opened_files else ""
-        )
+        active_file_str = f"Currently viewing: {active_file}" if active_file else ""
         
-        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 ""
+        opened_files_str = (
+            f"Open tabs:\n{'\n'.join(opened_files)}" if opened_files else ""
         )
+        existing_files_str = f"Files in directory:\n{existing_files}" if existing_files else ""
         return f"""<task>
 {user_input}
 </task>
@@ -52,11 +55,13 @@ def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode
 <environment_details>
 Current working directory: {cwd}
 
-{exist_files_str}
+{active_file_str}
 
 {opened_files_str}
 
-{content_str}
+{existing_files_str}
+
+{format_content(cwd, potential_paths, conversation_history)}
 
 </environment_details>
     """
@@ -152,6 +157,7 @@ async def handle_user_inputs(
     programmer_mode = bot_setting["programmerMode"]
     show_tool_results = bot_setting["showToolResults"]
     opened_files = bot_setting["openedFiles"]
+    active_file = bot_setting["activeFile"]
 
     start_new_stream = {
         "value": False
@@ -164,8 +170,8 @@ async def handle_user_inputs(
     conversation_history.append(
         {
             "role": "user",
-            "content": user_task_prompt(
-                conversation_history, cwd, user_input, programmer_mode, opened_files
+            "content": generate_user_task_prompt(
+                conversation_history, cwd, user_input, programmer_mode, active_file, opened_files
             ),
         }
     )

{pycoze-0.1.388.dist-info → pycoze-0.1.390.dist-info}/METADATA

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

{pycoze-0.1.388.dist-info → pycoze-0.1.390.dist-info}/RECORD

@@ -12,7 +12,7 @@ pycoze/api/lib/web.py,sha256=GWgtiTJOolKOX2drXcwuyqTcbo5FQVxa1NuBGcNyjyc,223
 pycoze/api/lib/window.py,sha256=dkzWfLwn5pE_L0DfQ38K8nx9tQyT5KO-GYyXi0rytFc,2073
 pycoze/bot/__init__.py,sha256=rL3Q-ycczRpSFfKn84fg3QBl5k22WpyeIU5qOEjEby8,79
 pycoze/bot/chat.py,sha256=4RGMwg2TjFERd-4LTIpQ6ilaRx4eP566KaQma2jg2O4,6296
-pycoze/bot/chat_base.py,sha256=BuDMyWSNVfRee94fUkNKubU8E8ME2hU4DzrzE7M3ZSQ,9973
+pycoze/bot/chat_base.py,sha256=wDPSGuIr4osM-LP0Np3TnNI1hsGWhtX0BE_RJupqUgU,10218
 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
@@ -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.388.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.388.dist-info/METADATA,sha256=jZ5uGP79BWdbRlta5YfKvg198O08PvzIGa828xxUOdU,854
-pycoze-0.1.388.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.388.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.388.dist-info/RECORD,,
+pycoze-0.1.390.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.390.dist-info/METADATA,sha256=jxXBcl2f3zX8nMSJuWCZzC_wuge-oA8DnmMC26LB7Qg,854
+pycoze-0.1.390.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pycoze-0.1.390.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.390.dist-info/RECORD,,