pycoze 0.1.388__tar.gz → 0.1.390__tar.gz

{pycoze-0.1.388 → pycoze-0.1.390}/PKG-INFO

@@ -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 → pycoze-0.1.390}/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 → pycoze-0.1.390}/pycoze.egg-info/PKG-INFO

@@ -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 → pycoze-0.1.390}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.388",
+    version="0.1.390",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",