jarvis-ai-assistant 0.1.97__py3-none-any.whl → 0.1.99__py3-none-any.whl

jarvis/jarvis_coder/file_select.py

@@ -0,0 +1,209 @@
+
+import os
+import re
+from typing import Dict, List
+from prompt_toolkit import PromptSession
+from prompt_toolkit.completion import WordCompleter, Completer, Completion
+from jarvis.utils import OutputType, PrettyOutput, get_single_line_input
+
+
+def _parse_file_selection(input_str: str, max_index: int) -> List[int]:
+    """Parse file selection expression
+    
+    Supported formats:
+    - Single number: "1"
+    - Comma-separated: "1,3,5"
+    - Range: "1-5"
+    - Combination: "1,3-5,7"
+    
+    Args:
+        input_str: User input selection expression
+        max_index: Maximum selectable index
+        
+    Returns:
+        List[int]: Selected index list (starting from 0)
+    """
+    selected = set()
+    
+    # Remove all whitespace characters
+    input_str = "".join(input_str.split())
+    
+    # Process comma-separated parts
+    for part in input_str.split(","):
+        if not part:
+            continue
+        
+        # Process range (e.g.: 3-6)
+        if "-" in part:
+            try:
+                start, end = map(int, part.split("-"))
+                # Convert to index starting from 0
+                start = max(0, start - 1)
+                end = min(max_index, end - 1)
+                if start <= end:
+                    selected.update(range(start, end + 1))
+            except ValueError:
+                PrettyOutput.print(f"Ignore invalid range expression: {part}", OutputType.WARNING)
+        # Process single number
+        else:
+            try:
+                index = int(part) - 1  # Convert to index starting from 0
+                if 0 <= index < max_index:
+                    selected.add(index)
+                else:
+                    PrettyOutput.print(f"Ignore index out of range: {part}", OutputType.WARNING)
+            except ValueError:
+                PrettyOutput.print(f"Ignore invalid number: {part}", OutputType.WARNING)
+    
+    return sorted(list(selected))
+
+def _get_file_completer(root_dir: str) -> Completer:
+    """Create file path completer"""
+    class FileCompleter(Completer):
+        def __init__(self, root_dir: str):
+            self.root_dir = root_dir
+            
+        def get_completions(self, document, complete_event):
+            # Get the text of the current input
+            text = document.text_before_cursor
+            
+            # If the input is empty, return all files in the root directory
+            if not text:
+                for path in self._list_files(""):
+                    yield Completion(path, start_position=0)
+                return
+                
+            # Get the current directory and partial file name
+            current_dir = os.path.dirname(text)
+            file_prefix = os.path.basename(text)
+            
+            # List matching files
+            search_dir = os.path.join(self.root_dir, current_dir) if current_dir else self.root_dir
+            if os.path.isdir(search_dir):
+                for path in self._list_files(current_dir):
+                    if path.startswith(text):
+                        yield Completion(path, start_position=-len(text))
+        
+        def _list_files(self, current_dir: str) -> List[str]:
+            """List all files in the specified directory (recursively)"""
+            files = []
+            search_dir = os.path.join(self.root_dir, current_dir)
+            
+            for root, _, filenames in os.walk(search_dir):
+                for filename in filenames:
+                    full_path = os.path.join(root, filename)
+                    rel_path = os.path.relpath(full_path, self.root_dir)
+                    # Ignore .git directory and other hidden files
+                    if not any(part.startswith('.') for part in rel_path.split(os.sep)):
+                        files.append(rel_path)
+            
+            return sorted(files)
+
+    return FileCompleter(root_dir)
+
+def _fuzzy_match_files(root_dir: str, pattern: str) -> List[str]:
+    """Fuzzy match file path
+    
+    Args:
+        pattern: Matching pattern
+        
+    Returns:
+        List[str]: List of matching file paths
+    """
+    matches = []
+    
+    # 将模式转换为正则表达式
+    pattern = pattern.replace('.', r'\.').replace('*', '.*').replace('?', '.')
+    pattern = f".*{pattern}.*"  # 允许部分匹配
+    regex = re.compile(pattern, re.IGNORECASE)
+    
+    # 遍历所有文件
+    for root, _, files in os.walk(root_dir):
+        for file in files:
+            full_path = os.path.join(root, file)
+            rel_path = os.path.relpath(full_path, root_dir)
+            # 忽略 .git 目录和其他隐藏文件
+            if not any(part.startswith('.') for part in rel_path.split(os.sep)):
+                if regex.match(rel_path):
+                    matches.append(rel_path)
+    
+    return sorted(matches)
+
+def select_files(related_files: List[str], root_dir: str) -> List[str]:
+    """Let the user select and supplement related files"""
+    PrettyOutput.section("Related files", OutputType.INFO)
+    
+    # Display found files
+    selected_files = list(related_files)  # Default select all
+    for i, file in enumerate(related_files, 1):
+        PrettyOutput.print(f"[{i}] {file}", OutputType.INFO)
+    
+    # Ask the user if they need to adjust the file list
+    user_input = get_single_line_input("Do you need to adjust the file list? (y/n) [n]").strip().lower() or 'n'
+    if user_input == 'y':
+        # Let the user select files
+        numbers = get_single_line_input("Please enter the file numbers to include (support: 1,3-6 format, press Enter to keep the current selection)").strip()
+        if numbers:
+            selected_indices = _parse_file_selection(numbers, len(related_files))
+            if selected_indices:
+                selected_files = [related_files[i] for i in selected_indices]
+            else:
+                PrettyOutput.print("No valid files selected, keep the current selection", OutputType.WARNING)
+    
+    # Ask if they need to supplement files
+    user_input = get_single_line_input("Do you need to supplement other files? (y/n) [n]").strip().lower() or 'n'
+    if user_input == 'y':
+        # Create file completion session
+        session = PromptSession(
+            completer=_get_file_completer(root_dir),
+            complete_while_typing=True
+        )
+        
+        while True:
+            PrettyOutput.print("\nPlease enter the file path to supplement (support Tab completion and *? wildcard, input empty line to end):", OutputType.INFO)
+            try:
+                file_path = session.prompt(">>> ").strip()
+            except KeyboardInterrupt:
+                break
+                
+            if not file_path:
+                break
+                
+            # Process wildcard matching
+            if '*' in file_path or '?' in file_path:
+                matches = _fuzzy_match_files(root_dir, file_path)
+                if not matches:
+                    PrettyOutput.print("No matching files found", OutputType.WARNING)
+                    continue
+                    
+                # Display matching files
+                PrettyOutput.print("\nFound the following matching files:", OutputType.INFO)
+                for i, path in enumerate(matches, 1):
+                    PrettyOutput.print(f"[{i}] {path}", OutputType.INFO)
+                    
+                # Let the user select
+                numbers = get_single_line_input("Please select the file numbers to add (support: 1,3-6 format, press Enter to select all)").strip()
+                if numbers:
+                    indices = _parse_file_selection(numbers, len(matches))
+                    if not indices:
+                        continue
+                    paths_to_add = [matches[i] for i in indices]
+                else:
+                    paths_to_add = matches
+            else:
+                paths_to_add = [file_path]
+            
+            # Add selected files
+            for path in paths_to_add:
+                full_path = os.path.join(root_dir, path)
+                if not os.path.isfile(full_path):
+                    PrettyOutput.print(f"File does not exist: {path}", OutputType.ERROR)
+                    continue
+                
+                try:
+                    selected_files.append(path)
+                    PrettyOutput.print(f"File added: {path}", OutputType.SUCCESS)
+                except Exception as e:
+                    PrettyOutput.print(f"Failed to read file: {str(e)}", OutputType.ERROR)
+    
+    return selected_files

jarvis/jarvis_coder/git_utils.py

@@ -2,35 +2,35 @@ import os
 from typing import List
 import yaml
 import time
-from jarvis.utils import OutputType, PrettyOutput, while_success
+from jarvis.utils import OutputType, PrettyOutput, find_git_root, while_success
 from jarvis.models.registry import PlatformRegistry
 
 def has_uncommitted_files() -> bool:
-    """判断代码库是否有未提交的文件"""
-    # 获取未暂存的修改
+    """Check if there are uncommitted files in the repository"""
+    # Get unstaged modifications
     unstaged = os.popen("git diff --name-only").read()
-    # 获取已暂存但未提交的修改
+    # Get staged but uncommitted modifications
     staged = os.popen("git diff --cached --name-only").read()
-    # 获取未跟踪的文件
+    # Get untracked files
     untracked = os.popen("git ls-files --others --exclude-standard").read()
     
     return bool(unstaged or staged or untracked)
 
 def generate_commit_message(git_diff: str) -> str:
-    """根据git diff和功能描述生成commit信息"""
-    prompt = f"""你是一个经验丰富的程序员，请根据以下代码变更和功能描述生成简洁明了的commit信息：
+    """Generate commit message based on git diff and feature description"""
+    prompt = f"""You are an experienced programmer, please generate a concise and clear commit message based on the following code changes and feature description:
 
-代码变更：
+Code changes:
 Git Diff:
 {git_diff}
 
-请遵循以下规则：
-1. 使用英文编写
-2. 采用常规的commit message格式：<type>(<scope>): <subject>
-3. 保持简洁，不超过50个字符
-4. 准确描述代码变更的主要内容
-5. 优先考虑功能描述和git diff中的变更内容
-6. 仅生成commit信息的文本，不要输出任何其他内容
+Please follow these rules:
+1. Write in English
+2. Use conventional commit message format: <type>(<scope>): <subject>
+3. Keep it concise, no more than 50 characters
+4. Accurately describe the main content of code changes
+5. Prioritize feature description and changes in git diff
+6. Only generate the commit message text, do not output anything else
 """
     
     model = PlatformRegistry().get_global_platform_registry().get_normal_platform()
@@ -39,15 +39,15 @@ Git Diff:
     return ';'.join(response.strip().split("\n"))
 
 def save_edit_record(record_dir: str, commit_message: str, git_diff: str) -> None:
-    """保存代码修改记录"""
-    # 获取下一个序号
+    """Save code modification record"""
+    # Get next sequence number
     existing_records = [f for f in os.listdir(record_dir) if f.endswith('.yaml')]
     next_num = 1
     if existing_records:
         last_num = max(int(f[:4]) for f in existing_records)
         next_num = last_num + 1
     
-    # 创建记录文件
+    # Create record file
     record = {
         "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
         "commit_message": commit_message,
@@ -58,4 +58,66 @@ def save_edit_record(record_dir: str, commit_message: str, git_diff: str) -> Non
     with open(record_path, "w", encoding="utf-8") as f:
         yaml.safe_dump(record, f, allow_unicode=True)
     
-    PrettyOutput.print(f"已保存修改记录: {record_path}", OutputType.SUCCESS) 
+    PrettyOutput.print(f"Modification record saved: {record_path}", OutputType.SUCCESS) 
+
+
+def init_git_repo(root_dir: str) -> str:
+    git_dir = find_git_root(root_dir)
+    if not git_dir:
+        git_dir = root_dir
+
+    PrettyOutput.print(f"Git root directory: {git_dir}", OutputType.INFO)
+
+    # 1. Check if the code repository path exists, if it does not exist, create it
+    if not os.path.exists(git_dir):
+        PrettyOutput.print(
+            "Root directory does not exist, creating...", OutputType.INFO)
+        os.makedirs(git_dir)
+
+    os.chdir(git_dir)
+
+    # 3. Process .gitignore file
+    gitignore_path = os.path.join(git_dir, ".gitignore")
+    gitignore_modified = False
+    jarvis_ignore_pattern = ".jarvis-*"
+
+    # 3.1 If .gitignore does not exist, create it
+    if not os.path.exists(gitignore_path):
+        PrettyOutput.print("Create .gitignore file", OutputType.INFO)
+        with open(gitignore_path, "w", encoding="utf-8") as f:
+            f.write(f"{jarvis_ignore_pattern}\n")
+        gitignore_modified = True
+    else:
+        # 3.2 Check if it already contains the .jarvis-* pattern
+        with open(gitignore_path, "r", encoding="utf-8") as f:
+            content = f.read()
+        
+        # 3.2 Check if it already contains the .jarvis-* pattern
+        if jarvis_ignore_pattern not in content.split("\n"):
+            PrettyOutput.print("Add .jarvis-* to .gitignore", OutputType.INFO)
+            with open(gitignore_path, "a", encoding="utf-8") as f:
+                # Ensure the file ends with a newline
+                if not content.endswith("\n"):
+                    f.write("\n")
+                f.write(f"{jarvis_ignore_pattern}\n")
+            gitignore_modified = True
+
+    # 4. Check if the code repository is a git repository, if not, initialize the git repository
+    if not os.path.exists(os.path.join(git_dir, ".git")):
+        PrettyOutput.print("Initialize Git repository", OutputType.INFO)
+        os.system("git init")
+        os.system("git add .")
+        os.system("git commit -m 'Initial commit'")
+    # 5. If .gitignore is modified, commit the changes
+    elif gitignore_modified:
+        PrettyOutput.print("Commit .gitignore changes", OutputType.INFO)
+        os.system("git add .gitignore")
+        os.system("git commit -m 'chore: update .gitignore to exclude .jarvis-* files'")
+    # 6. Check if there are uncommitted files in the code repository, if there are, commit once
+    elif has_uncommitted_files():
+        PrettyOutput.print("Commit uncommitted changes", OutputType.INFO)
+        os.system("git add .")
+        git_diff = os.popen("git diff --cached").read()
+        commit_message = generate_commit_message(git_diff)
+        os.system(f"git commit -m '{commit_message}'")
+    return git_dir