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

pycoze/api/lib/window.py

@@ -30,9 +30,15 @@ class WindowCls:
             "input", {"title": title, "message": message}
         )
 
+    def minimize(self):
+        socket.post("minimize", {})
+
     def maximize(self):
         socket.post("maximize", {})
 
+    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

@@ -5,23 +5,31 @@ from .message import info
 from pycoze.ai import chat_stream_async, extract
 from .tools import ToolExecutor
 from typing import List
-import time
 
 def guess_files_in_message(cwd: str, user_message: str) -> List[str]:
-
-    value = extract(
-        {"includedFiles": ["relative path format", "relative path format", "..."]},
-        'Please find the files mentioned in the text. If none, return {"includedFiles": []}:\n'
-        + user_message,
-    )
-    return [resolve_relative_path(cwd, p) for p in value["includedFiles"]]
+    try:
+        value = extract(
+            {"includedFiles": ["relative path format", "relative path format", "..."]},
+            'Please find the files mentioned in the text. If none, return {"includedFiles": []}:\n'
+            + user_message,
+        )
+        return [resolve_relative_path(cwd, p) for p in value["includedFiles"]]
+    except:
+        print("Failed to guess files in message")
+        return []
 
 
-def user_task_prompt(conversation_history, cwd, user_input: str, programmer_mode: bool):
+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)
+        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 ""
+        )
+        
         content = []
         for file_path in potential_paths:
             file_path = resolve_relative_path(cwd, file_path)
@@ -44,8 +52,9 @@ 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}
+
+{opened_files_str}
 
 {content_str}
 
@@ -142,6 +151,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
@@ -155,7 +165,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
             ),
         }
     )
@@ -217,18 +227,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

@@ -75,7 +75,6 @@ def get_system_prompt(abilities, bot_setting):
         "cd_prompt": cd_prompt,
         "abilities_str": abilities_str,
         "no_exit_if_incomplete": False,
-        "allow_read_file": False,
         "allow_read_multiple_files": False,
         "allow_execute_command": False,
         "allow_write_or_overwrite_file": False,
@@ -242,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/bot/prompt.md

@@ -20,12 +20,12 @@ Here's the translation in English:
 ```
 {% endif %}
 
-{% if allow_read_file %}
+{% if allow_read_multiple_files %}
 For example:
 ```json
 {
-  "read_file": {
-    "path": "src/main.js"
+  "read_multiple_files": {
+    "paths_list": ["src/main.js", "src/app.svelte", "src/styles.css"]
   }
 }
 ```
@@ -36,33 +36,6 @@ Always follow this format to ensure that tool usage is correctly parsed and exec
 ### Tools
 
 
-{% if allow_read_file %}
-#### Read File
-**Function Signature:**
-```python
-def read_file(path: str) -> str:
-    """
-    Reads the content of a file at a specified path. Use this tool when you need to inspect the contents of existing files, such as analyzing code, viewing text files, or extracting information from configuration files. Automatically extracts raw text from PDF and DOCX files. May not work well with other types of binary files as it returns raw content as a string.
-
-    Parameters:
-        path (str): The file path to read.
-    
-    Returns:
-        str: The content of the file.
-    """
-    pass
-```
-
-**Usage:**
-```json
-{
-  "read_file": {
-    "path": "file_path"
-  }
-}
-```
-{% endif %}
-
 {% if allow_read_multiple_files %}
 
 #### Read Multiple Files
@@ -132,7 +105,7 @@ def write_or_overwrite_file(path: str, content: str) -> None:
 
     Parameters:
         path (str): The file path to write.
-        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.
+        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！
     
     Returns:
         None
@@ -357,6 +330,8 @@ def complete_all_tasks(result: str, command: str = None) -> None:
 12. Never assume any outcome of tool usage—always wait for user confirmation.
 13. Be direct and technical in responses, avoiding unnecessary conversational elements.
 14. Always consider the broader context of the project and environment when making decisions.
+15. Before thinking about how to modify an existing code file, it is necessary to first read and understand the content of the existing file.
+16. You can't truncate or omit parts of the file content when writing or overwriting a file.
 
 
 ==== Goals

pycoze/bot/tools.py

@@ -256,7 +256,6 @@ class ToolExecutor:
 
     TOOL_MAP = {
         "execute_command": ExecuteCommandTool,
-        "read_file": ReadFileTool,
         "read_multiple_files": ReadMultipleFilesTool,
         "write_or_overwrite_file": WriteFileTool,
         "replace_part_of_a_file": ReplaceInFileTool,

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

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

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

@@ -4,20 +4,19 @@ pycoze/ai/vram_reserve.py,sha256=DRxKzqf89fLAts0DzU8e19z9kecIF8OdMkQnJlCKZV0,424
 pycoze/ai/llm/__init__.py,sha256=7qmligvCSneLx5AFCjKYfGURIiI4KlB4hE19SxIr-Xk,342
 pycoze/ai/llm/chat.py,sha256=sQZT0ImvRW81fXdlKG0ZrHdDB8g5M4iudaWdG4Kpd6Q,6373
 pycoze/ai/llm/text_to_image_prompt.py,sha256=0bx2C_YRvjAo7iphHGp1-pmGKsKqwur7dM0t3SiA8kA,3398
-pycoze/ai/llm/think.py,sha256=sUgTBdGzcZtL3r-Wx8M3lDuVUmDVz8g3qC0VU8uiKAI,5143
 pycoze/api/__init__.py,sha256=TLKvaZlRzTTt0KiXijLjj9b_iCr7fU1siwsXqyd74b8,375
 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=bTkQCzQZ7i3pYXB70bUSTBNJ9C4TW_X3yMae1VkquGk,1944
+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=cvwGmk8CfmaMPegWEPFzYSI8f2GojHugNp7-VlpGAv4,9618
-pycoze/bot/lib.py,sha256=wr8omzBtTwj63PrrN6SaNM0HDPPQGGTag4KkG6rixq4,7248
+pycoze/bot/chat.py,sha256=4RGMwg2TjFERd-4LTIpQ6ilaRx4eP566KaQma2jg2O4,6296
+pycoze/bot/chat_base.py,sha256=BuDMyWSNVfRee94fUkNKubU8E8ME2hU4DzrzE7M3ZSQ,9973
+pycoze/bot/lib.py,sha256=WMVhyKFXvNoLrS2wvNOakIJXyUmVE6ujCV6XVDV0M6A,7213
 pycoze/bot/message.py,sha256=udnIi-h4QgGzkbr_5VcAsVGjoLp9wXJSfBCeuOz7_Bk,802
-pycoze/bot/prompt.md,sha256=OBxwUY6yiwEmusnUHhwixWYByrWX3BpwfxG_Gfas8UM,15783
-pycoze/bot/tools.py,sha256=Pet8QbJ2E-qvoIEZ61-IZSOkjTi9elwSB5-2pAQmrZM,10311
+pycoze/bot/prompt.md,sha256=Km8GzmmC44HN0rnZh8txZxY52_0KWgyKh6GkjGQ3bCI,15379
+pycoze/bot/tools.py,sha256=X5gpYbiRQZMvduhfXZy8VGYwjXGw5ndqbGHb-gXTQIE,10276
 pycoze/reference/__init__.py,sha256=zgqGqvmA9HaqytEM33B6vi0kQVk8IiCwJaXa22xsFz8,114
 pycoze/reference/bot.py,sha256=UZK24Qm8kpqpwXJy_zNZeTEEDee05luXdSBeUm0NCt0,2029
 pycoze/reference/lib.py,sha256=T-oBOKxkus5dTouc0oDgfRzUyi6aTyY-FF4yX7SzF5M,3755
@@ -33,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.386.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.386.dist-info/METADATA,sha256=iKtBLcIVvD1-iDHjVRsRxx98x9Yciz9AxKJcb7E_42I,854
-pycoze-0.1.386.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pycoze-0.1.386.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.386.dist-info/RECORD,,
+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/ai/llm/think.py

@@ -1,131 +0,0 @@
-from pycoze import utils
-import json5
-import re
-from retrying import retry
-from openai import OpenAI
-import openai
-import requests
-import os
-
-
-def never_retry_on_rate_limit_error(exception):
-    """Return True if we should retry (in this case when it's NOT a RateLimitError), False otherwise"""
-    return not isinstance(exception, openai.RateLimitError)
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
-def think(user_text, history, temperature=0.2, stop=None, **kwargs):
-    user_msg = {"role": "user", "content": user_text}
-    cfg = utils.read_json_file("llm.json")
-
-    base_url = cfg["baseURL"]
-    api_key = cfg["apiKey"]
-    model = cfg["model"]
-
-    base_url = base_url.replace("/chat/completions", "")
-
-    client = OpenAI(api_key=api_key, base_url=base_url)
-
-    response = client.chat.completions.create(model=model,
-                                              messages=simple_history(history) + [user_msg],
-                                              temperature=temperature,
-                                              stop=stop)
-    return response.choices[0].message.content
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
-def think_stream(user_text, history, temperature=0.2, stop=None, **kwargs):
-    user_msg = {"role": "user", "content": user_text}
-    cfg = utils.read_json_file("llm.json")
-
-    base_url = cfg["baseURL"]
-    api_key = cfg["apiKey"]
-    model = cfg["model"]
-    
-    base_url = base_url.replace("/chat/completions", "")
-
-    client = OpenAI(api_key=api_key, base_url=base_url)
-
-
-    stream = client.chat.completions.create(model=model,
-                                            messages=simple_history(history) + [user_msg],
-                                            stream=True,
-                                            temperature=temperature,
-                                            stop=stop)
-    for chunk in stream:
-        yield chunk.choices[0].delta.content or ""
-
-
-def simple_history(history):
-    return [{"role": h["role"], "content": h["content"]} for h in history]
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
-def extract(response_data, text: str, temperature=0, **kwargs):
-    """print(extract({"name": "lowercase"}, "hello XiaoMing"))"""
-    if isinstance(response_data, dict):
-        response_items = [[res, response_data[res]] for res in response_data]
-    else:
-        response_items = response_data
-
-    json_text = ""
-    for i, res in enumerate(response_items):
-        comma = "," if i != len(response_items) - 1 else ""
-        json_text += f'    "{res[0]}": {res[1]}{comma}\n'
-
-    # Combine the provided text with the formatted JSON schema
-    think_text = f"""
-The output should be a markdown code snippet formatted in the following schema, including the leading and trailing "```json" and "```" tags:
-```json
-{{
-{json_text}
-}}
-```
-
-Request:
-{text}
-"""
-    # text放后面,当翻译等情况时,不会把"The output should"之类翻译了,导致错误
-    markdown = think(think_text, [], temperature=temperature, **kwargs)
-    pattern = r'```json(.*?)```'
-    matches = re.findall(pattern, markdown, re.DOTALL)
-    if matches:
-        json_str = matches[0].strip() 
-    # lines = [line.split("//")[0] for line in json_str.split("\n")]//这样当json中有//时会出错，例如https://
-    json_dict = json5.loads(json_str)
-    for item in response_items:
-        if item[0] not in json_dict:
-            raise "item:" + item + " not exists"
-    return json_dict
-
-
-def yes_or_no(question, temperature=0, **kwargs):
-    result = extract([("Result", "Yes or No")], question, 
-                     temperature=temperature, **kwargs)["Result"]
-    if isinstance(result, bool):
-        return result
-    return result.upper() == "YES"
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
-def extract_code(text: str, temperature=0, language="python", markdown_word='python', **kwargs):
-    """print(extract_code("sum 1~100"))"""
-    think_text = text + f"""
-The output should be a complete and usable {language} code snippet, including the leading and trailing "```{markdown_word}" and "```":
-"""
-    markdown = think(think_text, [], temperature=temperature, **kwargs)
-    # 使用正则表达式匹配围绕在```{markdown_word} 和 ```之间的文本
-    pattern = rf'```{markdown_word}(.*?)```'
-    matches = re.findall(pattern, markdown, re.DOTALL)
-    if matches:
-        # 去除可能的前后空白字符
-        return matches[0].strip()
-    else:
-        raise Exception("The string is not a valid python code.")
-
-
-if __name__ == "__main__":
-    print(think("你好", []))
-    for chunk in think_stream("你好", []):
-        print(chunk)
-    print(extract({"name": "lowercase"}, "hello XiaoMing"))
-    print(extract_code("sum 1~100"))