auto-coder 0.1.259__py3-none-any.whl → 0.1.260__py3-none-any.whl

autocoder/common/command_completer.py

@@ -1,6 +1,9 @@
 from prompt_toolkit.completion import Completer, Completion, CompleteEvent
 from prompt_toolkit.document import Document
 import pydantic
+from typing import Callable,Dict,Any
+from pydantic import BaseModel,SkipValidation
+from autocoder.common import AutoCoderArgs
 import os
 
 COMMANDS = {
@@ -38,6 +41,8 @@ COMMANDS = {
         "/speed-test": "",
         "/input_price": "",
         "/output_price": "",       
+    },
+    "/auto": {     
     }
 }
 
@@ -48,6 +53,24 @@ class Tag(pydantic.BaseModel):
     end_tag: str
 
 
+class FileSystemModel(pydantic.BaseModel):
+    project_root: str
+    get_all_file_names_in_project: SkipValidation[Callable]
+    get_all_file_in_project: SkipValidation[Callable]
+    get_all_dir_names_in_project: SkipValidation[Callable]
+    get_all_file_in_project_with_dot: SkipValidation[Callable]
+    get_symbol_list: SkipValidation[Callable]
+
+class MemoryConfig(BaseModel):
+    """
+    A model to encapsulate memory configuration and operations.
+    """
+    memory: Dict[str, Any]
+    save_memory_func: SkipValidation[Callable]
+
+    class Config:
+        arbitrary_types_allowed = True
+
 class CommandTextParser:
     def __init__(self, text: str, command: str):
         self.text = text
@@ -322,3 +345,546 @@ class CommandTextParser:
                 self.consume_tag()
             else:
                 self.consume_coding_value()
+
+
+class CommandCompleter(Completer):
+    def __init__(self, commands, file_system_model: FileSystemModel, memory_model: MemoryConfig):
+        self.commands = commands
+        self.file_system_model = file_system_model
+        self.memory_model = memory_model
+        self.all_file_names = file_system_model.get_all_file_names_in_project()
+        self.all_files = file_system_model.get_all_file_in_project()
+        self.all_dir_names = file_system_model.get_all_dir_names_in_project()
+        self.all_files_with_dot = file_system_model.get_all_file_in_project_with_dot()
+        self.symbol_list = file_system_model.get_symbol_list()
+        self.current_file_names = []
+
+    def get_completions(self, document, complete_event):
+        text = document.text_before_cursor
+        words = text.split()
+
+        if len(words) > 0:
+            if words[0] == "/mode":
+                left_word = text[len("/mode"):]
+                for mode in ["normal", "auto_detect", "voice_input"]:
+                    if mode.startswith(left_word.strip()):
+                        yield Completion(mode, start_position=-len(left_word.strip()))
+
+            if words[0] == "/add_files":
+                new_text = text[len("/add_files"):]
+                parser = CommandTextParser(new_text, words[0])
+                parser.add_files()
+                current_word = parser.current_word()
+
+                if parser.last_sub_command() == "/refresh":
+                    return
+
+                for command in parser.get_sub_commands():
+                    if command.startswith(current_word):
+                        yield Completion(command, start_position=-len(current_word))
+
+                if parser.first_sub_command() == "/group" and (
+                    parser.last_sub_command() == "/group"
+                    or parser.last_sub_command() == "/drop"
+                ):
+                    group_names = self.memory_model.memory["current_files"]["groups"].keys()
+                    if "," in current_word:
+                        current_word = current_word.split(",")[-1]
+
+                    for group_name in group_names:
+                        if group_name.startswith(current_word):
+                            yield Completion(
+                                group_name, start_position=-len(current_word)
+                            )
+
+                if parser.first_sub_command() != "/group":
+                    if current_word and current_word.startswith("."):
+                        for file_name in self.all_files_with_dot:
+                            if file_name.startswith(current_word):
+                                yield Completion(
+                                    file_name, start_position=-
+                                    len(current_word)
+                                )
+                    else:
+                        for file_name in self.all_file_names:
+                            if file_name.startswith(current_word):
+                                yield Completion(
+                                    file_name, start_position=-
+                                    len(current_word)
+                                )
+                        for file_name in self.all_files:
+                            if current_word and current_word in file_name:
+                                yield Completion(
+                                    file_name, start_position=-
+                                    len(current_word)
+                                )            
+            elif words[0] == "/remove_files":
+                new_words = text[len("/remove_files"):].strip().split(",")
+
+                is_at_space = text[-1] == " "
+                last_word = new_words[-2] if len(new_words) > 1 else ""
+                current_word = new_words[-1] if new_words else ""
+
+                if is_at_space:
+                    last_word = current_word
+                    current_word = ""
+
+                # /remove_files /all [cursor] or /remove_files /all p[cursor]
+                if not last_word and not current_word:
+                    if "/all".startswith(current_word):
+                        yield Completion("/all", start_position=-len(current_word))
+                    for file_name in self.current_file_names:
+                        yield Completion(file_name, start_position=-len(current_word))
+
+                # /remove_files /a[cursor] or /remove_files p[cursor]
+                if current_word:
+                    if "/all".startswith(current_word):
+                        yield Completion("/all", start_position=-len(current_word))
+                    for file_name in self.current_file_names:
+                        if current_word and current_word in file_name:
+                            yield Completion(
+                                file_name, start_position=-len(current_word)
+                            )
+            elif words[0] == "/exclude_dirs":
+                new_words = text[len("/exclude_dirs"):].strip().split(",")
+                current_word = new_words[-1]
+
+                for file_name in self.all_dir_names:
+                    if current_word and current_word in file_name:
+                        yield Completion(file_name, start_position=-len(current_word))
+
+            elif words[0] == "/lib":
+                new_text = text[len("/lib"):]
+                parser = CommandTextParser(new_text, words[0])
+                parser.lib()
+                current_word = parser.current_word()
+
+                for command in parser.get_sub_commands():
+                    if command.startswith(current_word):
+                        yield Completion(command, start_position=-len(current_word))
+
+                if parser.last_sub_command() in ["/add", "/remove", "/get"]:
+                    for lib_name in self.memory_model.memory.get("libs", {}).keys():
+                        if lib_name.startswith(current_word):
+                            yield Completion(
+                                lib_name, start_position=-len(current_word)
+                            )
+            elif words[0] == "/mcp":
+                new_text = text[len("/mcp"):]
+                parser = CommandTextParser(new_text, words[0])
+                parser.lib()
+                current_word = parser.current_word()
+                for command in parser.get_sub_commands():
+                    if command.startswith(current_word):
+                        yield Completion(command, start_position=-len(current_word))
+            elif words[0] == "/models":
+                new_text = text[len("/models"):]
+                parser = CommandTextParser(new_text, words[0])
+                parser.lib()
+                current_word = parser.current_word()
+                for command in parser.get_sub_commands():
+                    if command.startswith(current_word):
+                        yield Completion(command, start_position=-len(current_word))
+
+            elif words[0] == "/coding":
+                new_text = text[len("/coding"):]
+                parser = CommandTextParser(new_text, words[0])
+                parser.lib()
+                current_word = parser.current_word()
+                for command in parser.get_sub_commands():
+                    if command.startswith(current_word):
+                        yield Completion(command, start_position=-len(current_word))
+
+            elif words[0] == "/conf":
+                new_words = text[len("/conf"):].strip().split()
+                is_at_space = text[-1] == " "
+                last_word = new_words[-2] if len(new_words) > 1 else ""
+                current_word = new_words[-1] if new_words else ""
+                completions = []
+
+                if is_at_space:
+                    last_word = current_word
+                    current_word = ""
+
+                # /conf /drop [curor] or /conf /drop p[cursor]
+                if last_word == "/drop":
+                    completions = [
+                        field_name
+                        for field_name in self.memory_model.memory["conf"].keys()
+                        if field_name.startswith(current_word)
+                    ]
+                # /conf [curosr]
+                elif not last_word and not current_word:
+                    completions = [
+                        "/drop"] if "/drop".startswith(current_word) else []
+                    completions += [
+                        field_name + ":"
+                        for field_name in AutoCoderArgs.model_fields.keys()
+                        if field_name.startswith(current_word)
+                    ]
+                # /conf p[cursor]
+                elif not last_word and current_word:
+                    completions = [
+                        "/drop"] if "/drop".startswith(current_word) else []
+                    completions += [
+                        field_name + ":"
+                        for field_name in AutoCoderArgs.model_fields.keys()
+                        if field_name.startswith(current_word)
+                    ]
+
+                for completion in completions:
+                    yield Completion(completion, start_position=-len(current_word))
+            elif words[0] in ["/chat", "/coding","/auto"]:
+                image_extensions = (
+                    ".png",
+                    ".jpg",
+                    ".jpeg",
+                    ".gif",
+                    ".bmp",
+                    ".tiff",
+                    ".tif",
+                    ".webp",
+                    ".svg",
+                    ".ico",
+                    ".heic",
+                    ".heif",
+                    ".raw",
+                    ".cr2",
+                    ".nef",
+                    ".arw",
+                    ".dng",
+                    ".orf",
+                    ".rw2",
+                    ".pef",
+                    ".srw",
+                    ".eps",
+                    ".ai",
+                    ".psd",
+                    ".xcf",
+                )
+                new_text = text[len(words[0]):]
+                parser = CommandTextParser(new_text, words[0])
+
+                parser.coding()
+                current_word = parser.current_word()
+
+                if len(new_text.strip()) == 0 or new_text.strip() == "/":
+                    for command in parser.get_sub_commands():
+                        if command.startswith(current_word):
+                            yield Completion(command, start_position=-len(current_word))
+
+                all_tags = parser.tags
+
+                if current_word.startswith("@"):
+                    name = current_word[1:]
+                    target_set = set()
+
+                    for file_name in self.current_file_names:
+                        base_file_name = os.path.basename(file_name)
+                        if name in base_file_name:
+                            target_set.add(base_file_name)
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else file_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+                            yield Completion(
+                                relative_path,
+                                start_position=-len(name),
+                                display=f"{display_name} (in active files)",
+                            )
+
+                    for file_name in self.all_file_names:
+                        if file_name.startswith(name) and file_name not in target_set:
+                            target_set.add(file_name)
+
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else file_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+
+                            yield Completion(
+                                relative_path,
+                                start_position=-len(name),
+                                display=f"{display_name}",
+                            )
+
+                    for file_name in self.all_files:
+                        if name in file_name and file_name not in target_set:
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else file_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+                            yield Completion(
+                                relative_path,
+                                start_position=-len(name),
+                                display=f"{display_name}",
+                            )
+
+                if current_word.startswith("@@"):
+                    name = current_word[2:]
+                    for symbol in self.symbol_list:
+                        if name in symbol.symbol_name:
+                            file_name = symbol.file_name
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else symbol.symbol_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+                            yield Completion(
+                                f"{symbol.symbol_name}(location: {relative_path})",
+                                start_position=-len(name),
+                                display=f"{symbol.symbol_name} ({display_name}/{symbol.symbol_type})",
+                            )
+
+                tags = [tag for tag in parser.tags]
+
+                if current_word.startswith("<"):
+                    name = current_word[1:]
+                    for tag in ["<img>", "</img>"]:
+                        if all_tags and all_tags[-1].start_tag == "<img>":
+                            if tag.startswith(name):
+                                yield Completion(
+                                    "</img>", start_position=-len(current_word)
+                                )
+                        elif tag.startswith(name):
+                            yield Completion(tag, start_position=-len(current_word))
+
+                if tags and tags[-1].start_tag == "<img>" and tags[-1].end_tag == "":
+                    raw_file_name = tags[0].content
+                    file_name = raw_file_name.strip()
+                    parent_dir = os.path.dirname(file_name)
+                    file_basename = os.path.basename(file_name)
+                    search_dir = parent_dir if parent_dir else "."
+                    for root, dirs, files in os.walk(search_dir):
+                        # 只处理直接子目录
+                        if root != search_dir:
+                            continue
+
+                        # 补全子目录
+                        for dir in dirs:
+                            full_path = os.path.join(root, dir)
+                            if full_path.startswith(file_name):
+                                relative_path = os.path.relpath(
+                                    full_path, search_dir)
+                                yield Completion(
+                                    relative_path,
+                                    start_position=-len(file_basename),
+                                )
+
+                        # 补全文件
+                        for file in files:
+                            if file.lower().endswith(
+                                image_extensions
+                            ) and file.startswith(file_basename):
+                                full_path = os.path.join(root, file)
+                                relative_path = os.path.relpath(
+                                    full_path, search_dir)
+                                yield Completion(
+                                    relative_path,
+                                    start_position=-len(file_basename),
+                                )
+
+                        # 只处理一层子目录，然后退出循环
+                        break        
+
+            elif not words[0].startswith("/"):                
+                image_extensions = (
+                    ".png",
+                    ".jpg",
+                    ".jpeg",
+                    ".gif",
+                    ".bmp",
+                    ".tiff",
+                    ".tif",
+                    ".webp",
+                    ".svg",
+                    ".ico",
+                    ".heic",
+                    ".heif",
+                    ".raw",
+                    ".cr2",
+                    ".nef",
+                    ".arw",
+                    ".dng",
+                    ".orf",
+                    ".rw2",
+                    ".pef",
+                    ".srw",
+                    ".eps",
+                    ".ai",
+                    ".psd",
+                    ".xcf",
+                )
+                new_text = text
+                parser = CommandTextParser(new_text, "/auto")
+
+                parser.coding()
+                current_word = parser.current_word()
+
+                if len(new_text.strip()) == 0 or new_text.strip() == "/":
+                    for command in parser.get_sub_commands():
+                        if command.startswith(current_word):
+                            yield Completion(command, start_position=-len(current_word))
+
+                all_tags = parser.tags
+
+                if current_word.startswith("@"):
+                    name = current_word[1:]
+                    target_set = set()
+
+                    for file_name in self.current_file_names:
+                        base_file_name = os.path.basename(file_name)
+                        if name in base_file_name:
+                            target_set.add(base_file_name)
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else file_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+                            yield Completion(
+                                relative_path,
+                                start_position=-len(name),
+                                display=f"{display_name} (in active files)",
+                            )
+
+                    for file_name in self.all_file_names:
+                        if file_name.startswith(name) and file_name not in target_set:
+                            target_set.add(file_name)
+
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else file_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+
+                            yield Completion(
+                                relative_path,
+                                start_position=-len(name),
+                                display=f"{display_name}",
+                            )
+
+                    for file_name in self.all_files:
+                        if name in file_name and file_name not in target_set:
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else file_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+                            yield Completion(
+                                relative_path,
+                                start_position=-len(name),
+                                display=f"{display_name}",
+                            )
+
+                if current_word.startswith("@@"):
+                    name = current_word[2:]
+                    for symbol in self.symbol_list:
+                        if name in symbol.symbol_name:
+                            file_name = symbol.file_name
+                            path_parts = file_name.split(os.sep)
+                            display_name = (
+                                os.sep.join(path_parts[-3:])
+                                if len(path_parts) > 3
+                                else symbol.symbol_name
+                            )
+                            relative_path = os.path.relpath(
+                                file_name, self.file_system_model.project_root)
+                            yield Completion(
+                                f"{symbol.symbol_name}(location: {relative_path})",
+                                start_position=-len(name),
+                                display=f"{symbol.symbol_name} ({display_name}/{symbol.symbol_type})",
+                            )
+
+                tags = [tag for tag in parser.tags]
+
+                if current_word.startswith("<"):
+                    name = current_word[1:]
+                    for tag in ["<img>", "</img>"]:
+                        if all_tags and all_tags[-1].start_tag == "<img>":
+                            if tag.startswith(name):
+                                yield Completion(
+                                    "</img>", start_position=-len(current_word)
+                                )
+                        elif tag.startswith(name):
+                            yield Completion(tag, start_position=-len(current_word))
+
+                if tags and tags[-1].start_tag == "<img>" and tags[-1].end_tag == "":
+                    raw_file_name = tags[0].content
+                    file_name = raw_file_name.strip()
+                    parent_dir = os.path.dirname(file_name)
+                    file_basename = os.path.basename(file_name)
+                    search_dir = parent_dir if parent_dir else "."
+                    for root, dirs, files in os.walk(search_dir):
+                        # 只处理直接子目录
+                        if root != search_dir:
+                            continue
+
+                        # 补全子目录
+                        for dir in dirs:
+                            full_path = os.path.join(root, dir)
+                            if full_path.startswith(file_name):
+                                relative_path = os.path.relpath(
+                                    full_path, search_dir)
+                                yield Completion(
+                                    relative_path,
+                                    start_position=-len(file_basename),
+                                )
+
+                        # 补全文件
+                        for file in files:
+                            if file.lower().endswith(
+                                image_extensions
+                            ) and file.startswith(file_basename):
+                                full_path = os.path.join(root, file)
+                                relative_path = os.path.relpath(
+                                    full_path, search_dir)
+                                yield Completion(
+                                    relative_path,
+                                    start_position=-len(file_basename),
+                                )
+
+                        # 只处理一层子目录，然后退出循环
+                        break
+            else:
+                for command in self.commands:
+                    if command.startswith(text):
+                        yield Completion(command, start_position=-len(text))
+
+        else:
+            for command in self.commands:
+                if command.startswith(text):
+                    yield Completion(command, start_position=-len(text))
+
+    def update_current_files(self, files):
+        self.current_file_names = [f for f in files]
+
+    def refresh_files(self):
+        self.all_file_names = self.file_system_model.get_all_file_names_in_project()
+        self.all_files = self.file_system_model.get_all_file_in_project()
+        self.all_dir_names = self.file_system_model.get_all_dir_names_in_project()
+        self.all_files_with_dot = self.file_system_model.get_all_file_in_project_with_dot()
+        self.symbol_list = self.file_system_model.get_symbol_list()

autocoder/common/git_utils.py

@@ -1,7 +1,7 @@
 import os
 from git import Repo, GitCommandError
 from loguru import logger
-from typing import List, Optional
+from typing import List, Optional, Dict
 from pydantic import BaseModel
 import byzerllm
 from rich.console import Console
@@ -11,6 +11,16 @@ from rich.table import Table
 from rich.text import Text
 
 
+class FileChange(BaseModel):
+    file_path: str
+    before: Optional[str] = None
+    after: Optional[str] = None
+
+class CommitChangesResult(BaseModel):
+    success: bool
+    changes: Dict[str, FileChange] = {}
+    error_message: Optional[str] = None
+
 class CommitResult(BaseModel):
     success: bool
     commit_message: Optional[str] = None
@@ -605,6 +615,77 @@ def generate_commit_message(changes_report: str) -> str:
     请输出commit message, 不要输出任何其他内容.
     '''
 
+def get_commit_by_message(repo_path: str, message: str):
+    repo = get_repo(repo_path)
+    try:
+        commit_hash = repo.git.log("--all", f"--grep={message}", "--format=%H", "-n", "1")
+        if not commit_hash:
+            return None
+        return repo.commit(commit_hash.strip())
+    except GitCommandError as e:
+        logger.error(f"Error finding commit: {e}")
+        return None
+
+def get_changes_by_commit_message(repo_path: str, message: str) -> CommitChangesResult:
+    """
+    根据提交信息查找对应的变更内容
+    
+    Args:
+        repo_path: Git仓库路径
+        message: 提交信息
+        
+    Returns:
+        CommitChangesResult: 包含变更前后内容的字典，键为文件路径
+    """
+    try:
+        if repo_path:
+            repo = get_repo(repo_path)
+        else:
+            repo = get_repo(os.getcwd())
+        commit = get_commit_by_message(repo_path, message)
+        
+        if not commit:
+            return CommitChangesResult(success=False, error_message="Commit not found")
+
+        changes = {}
+        
+        # 比较当前commit与其父commit的差异
+        for diff_item in commit.parents[0].diff(commit):
+            file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
+            
+            # 获取变更前内容
+            before_content = None
+            try:
+                if diff_item.a_blob:
+                    before_content = repo.git.show(f"{commit.parents[0].hexsha}:{file_path}")
+            except GitCommandError:
+                pass  # 文件可能是新增的
+
+            # 获取变更后内容
+            after_content = None
+            try:
+                if diff_item.b_blob:
+                    after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
+            except GitCommandError:
+                pass  # 文件可能被删除
+
+            changes[file_path] = FileChange(
+                file_path=file_path,
+                before=before_content,
+                after=after_content
+            )
+
+        return CommitChangesResult(success=True, changes=changes)
+
+    except GitCommandError as e:
+        logger.error(f"Error retrieving changes: {e}")
+        return CommitChangesResult(success=False, error_message=str(e))
+    except IndexError:
+        return CommitChangesResult(success=False, error_message="Initial commit has no parent")
+    except Exception as e:
+        logger.error(f"Unexpected error: {e}")
+        return CommitChangesResult(success=False, error_message=str(e))
+
 def print_commit_info(commit_result: CommitResult):
     console = Console()
     table = Table(