jarvis-ai-assistant 0.1.121__py3-none-any.whl → 0.1.123__py3-none-any.whl

jarvis/jarvis_code_agent/patch.py

@@ -21,276 +21,162 @@ class PatchOutputHandler(OutputHandler):
     
     def prompt(self) -> str:
         return """
-# 🔄 REPLACE: Modify existing code
-<REPLACE>
-File: path/to/file
-Lines: [start,end] or [start,end)
-[new content]
-...
-</REPLACE>
-
-# ➕ INSERT: Add new code
-<INSERT>
-File: path/to/file
-Line: position
-[new content]
-...
-</INSERT>
-
-# 🗑️ DELETE: Remove existing code
-<DELETE>
-File: path/to/file
-Lines: [start,end] or [start,end)
-</DELETE>
-
-# 🆕 NEW_FILE: Create new file
-<NEW_FILE>
-File: path/to/file
-[new content]
-...
-</NEW_FILE>
-
-# ➡️ MOVE_FILE: Relocate a file
-<MOVE_FILE>
-File: path/to/source/file
-NewPath: path/to/destination/file
-</MOVE_FILE>
-
-# ❌ REMOVE_FILE: Delete entire file
-<REMOVE_FILE>
-File: path/to/file
-</REMOVE_FILE>
-
-# 📋 Formatting Rules
-1. File Paths
-   - Use relative paths from project root
-   - Must be exact and case-sensitive
-   - Example: src/module/file.py
-   
-2. Line Numbers
-   - Format: [start,end] (inclusive) or [start,end) (right-exclusive)
-   - 1-based line numbers
-   - Single number for INSERT
-   - Omit for NEW_FILE/REMOVE_FILE
-
-3. Content
-   - Maintain original indentation
-   - Follow existing code style
-
-# 📌 Usage Examples
-## REPLACE Example (Closed Interval)
-<REPLACE>
-File: src/utils.py
-Lines: [9,13]
-def updated_function():
-    # Replaces lines 9-13 inclusive
-    return "new_implementation"
-</REPLACE>
-
-## REPLACE Example (Left-Closed Right-Open)
-<REPLACE>
-File: src/calculator.py
-Lines: [5,8)
-def new_calculation():
-    # Replaces lines 5-7 (excludes line 8)
-    return 42
-</REPLACE>
-
-## INSERT Example
-<INSERT>
-File: src/main.py
-Line: 19
-    # Inserted before line 19
-    new_feature()
-</INSERT>
-
-## NEW_FILE Example
-<NEW_FILE>
-File: src/new_module.py
-# New file creation
-def feature_entry():
-    pass
-</NEW_FILE>
-
-## DELETE Example
-<DELETE>
-File: src/utils.py
-Lines: [9,13]
-</DELETE>
-
-## MOVE_FILE Example
-<MOVE_FILE>
-File: src/old_dir/file.py
-NewPath: src/new_dir/file.py
-</MOVE_FILE>
-
-## REMOVE_FILE Example
-<REMOVE_FILE>
-File: src/obsolete.py
-</REMOVE_FILE>
-
-# 🚨 Critical Requirements
-1. One change per block
-2. Use correct operation type
-3. Match existing code style
-4. Preserve indentation levels
-5. Exact file paths required
-6. Handle edge cases properly
-7. Include error handling
-8. Maintain code consistency
-
-# 🚫 Invalid Format Examples
-## BAD EXAMPLE 1 - Do not use diff format
-<REPLACE>
-File: src/file.py
-Lines: [5,8)
-- old_line_1
-+ new_line_1
-</REPLACE>
-
-## BAD EXAMPLE 2 - Do not include previous and new tags
-<REPLACE>
-File: src/file.py
-Lines: [10,12]
-<PREVIOUS>
-old_code
-</PREVIOUS>
-<NEW>
-new_code
-</NEW>
-</REPLACE>
-
-## BAD EXAMPLE 3 - Do not use comment to explain
-<REPLACE>
-File: src/file.py
-Lines: [15,18]
-# Replace the following code
-old_function()
-# With the new implementation
-new_function()
-</REPLACE>
+# 🛠️ Code Patch Specification
+When making changes, you MUST:
+1. Explain each modification BEFORE the <PATCH> block using:
+   # [OPERATION] on [FILE]: Lines X-Y
+   # Reason: [CLEAR EXPLANATION]
+2. Maintain original code style and compatibility:
+   - Preserve existing indentation levels
+   - Keep surrounding empty lines
+   - Match variable naming conventions
+   - Maintain API compatibility
+3. Follow the exact patch format below
+4. Use separate <PATCH> blocks for different files
+5. Include ONLY modified lines in content
+
+<PATCH>
+File path [Range]
+Code content
+</PATCH>
+
+Critical Rules:
+- NEVER include unchanged code in patch content
+- ONLY show lines that are being modified/added
+- Maintain original line breaks around modified sections
+- Preserve surrounding comments unless explicitly modifying them
+
+Examples:
+# ======== REPLACE ========
+# GOOD: Only modified lines
+# REPLACE in src/app.py: Lines 5-8
+# Reason: Update calculation formula
+<PATCH>
+src/app.py [5,8]
+    result = (base_value * 1.15) + tax
+    logger.debug("New calculation applied")
+</PATCH>
+
+# BAD: Includes unchanged lines
+<PATCH>
+src/app.py [5,8]
+def calculate():
+    # Original comment (should not be included)
+    result = (base_value * 1.15) + tax
+    return result  # Original line
+</PATCH>
+
+# ======== INSERT ========
+# GOOD: Insert single line
+# INSERT in utils/logger.py: Before line 3 
+# Reason: Add initialization check
+<PATCH>
+utils/logger.py [3]
+if not _initialized: initialize()
+</PATCH>
+
+# BAD: Extra empty lines
+<PATCH>
+utils/logger.py [3]
+
+if not _initialized: 
+    initialize()
+
+</PATCH>
+
+# ======== NEW FILE ========
+# GOOD: Complete minimal content
+# NEW FILE in config/settings.yaml: Create new config
+<PATCH>
+config/settings.yaml [1]
+database:
+  host: localhost
+  port: 5432
+</PATCH>
+
+# BAD: Placeholder content
+<PATCH>
+config/settings.yaml [1]
+TODO: Add configuration
+</PATCH>
+
+# ======== DELETE ========
+# GOOD: Empty content for deletion
+# DELETE in src/old.py: Lines 10-12 
+# Reason: Remove deprecated function
+<PATCH>
+src/old.py [10,12]
+</PATCH>
+
+# BAD: Comment in delete operation
+<PATCH>
+src/old.py [10,12]
+# Remove these lines
+</PATCH>
 """
 
 
 def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
-    """Parse patches from string with optimized format"""
+    """解析补丁格式"""
     result = {}
-    patches = re.findall(r"<(REPLACE|INSERT|DELETE|NEW_FILE|REMOVE_FILE|MOVE_FILE)>(.*?)</\1>", patch_str, re.DOTALL)
+    header_pattern = re.compile(
+        r'^\s*"?(.+?)"?\s*\[(\d+)(?:,(\d+))?\]\s*$'  # Match file path and line number
+    )
+    patches = re.findall(r'<PATCH>\n?(.*?)\n?</PATCH>', patch_str, re.DOTALL)
     
-    for patch_type, patch in patches:
-        lines = patch.strip().split('\n')
-        if not lines:
+    for patch in patches:
+        # 分割首行和内容
+        parts = patch.split('\n', 1)
+        if len(parts) < 1:
             continue
+        header_line = parts[0].strip()
+        content = parts[1] if len(parts) > 1 else ''
+        
+        # 仅在内容非空时添加换行符
+        if content and not content.endswith('\n'):
+            content += '\n'
             
-        # Parse file path
-        file_match = re.match(r"File:\s*([^\s]+)", lines[0])
-        if not file_match:
+        # 解析文件路径和行号
+        header_match = header_pattern.match(header_line)
+        if not header_match:
             continue
-        filepath = file_match.group(1).strip()
-        
-        # Initialize line numbers
-        start_line = end_line = 0
-        
-        # Parse line numbers based on operation type
-        if patch_type in ['REPLACE', 'DELETE']:
-            # 增强正则表达式兼容性
-            line_match = re.match(
-                r"^Lines:\s*\[\s*(\d+)\s*(?:,\s*(\d+)\s*)?([\]\)])\s*$",  # 支持单数字格式
-                lines[1].strip(),  # 去除前后空格
-                re.IGNORECASE
-            )
-            if line_match:
-                start_line = int(line_match.group(1))
-                end_value = int(line_match.group(2) or line_match.group(1))  # 第二个数字不存在时使用第一个
-                bracket_type = line_match.group(3).strip()
-                
-                # 根据括号类型处理区间
-                if bracket_type == ')':  # [m,n)
-                    end_line = end_value - 1
-                else:  # [m,n]
-                    end_line = end_value
-                
-                # 确保 end_line >= start_line
-                end_line = max(end_line, start_line)
-            else:
-                PrettyOutput.print(f"无法解析行号格式: {lines[1]}", OutputType.WARNING)
-                continue
-        elif patch_type == 'INSERT':
-            line_match = re.match(r"Line:\s*(\d+)", lines[1])
-            if line_match:
-                start_line = int(line_match.group(1))  # 1-based
-                end_line = start_line
-        elif patch_type == 'MOVE_FILE':
-            new_path_match = re.match(r"NewPath:\s*([^\s]+)", lines[1])
-            if new_path_match:
-                new_path = new_path_match.group(1).strip()
-            else:
-                continue
-        
-        # Get content (after metadata)
-        if patch_type in ['REPLACE', 'DELETE']:
-            content_start = 2  # File + Lines
-        elif patch_type == 'INSERT':
-            content_start = 2   # File + Line
-        elif patch_type == 'NEW_FILE':
-            content_start = 1   # File
-        elif patch_type == 'MOVE_FILE':
-            content_start = 2   # File + NewPath
-        elif patch_type == 'REMOVE_FILE':
-            content_start = 1   # File
-        
-        content_lines = lines[content_start:]
-        # 保留原始缩进和空行
-        content = '\n'.join(content_lines).rstrip('\n') + '\n'  # 保留末尾换行
 
+        filepath = header_match.group(1)
+        start = int(header_match.group(2))       # 保持1-based行号
+        end = int(header_match.group(3)) + 1 if header_match.group(3) else start
+
+        # 存储参数
         if filepath not in result:
             result[filepath] = []
-        
-        # Handle MOVE_FILE specially
-        if patch_type == 'MOVE_FILE':
-            result[filepath].append({
-                'type': patch_type,
-                'new_path': new_path,
-                'content': content
-            })
-        else:
-            result[filepath].append({
-                'type': patch_type,
-                'start_line': start_line,
-                'end_line': end_line,
-                'content': content
-            })
-    
-    # Sort patches by start line in reverse order to apply from bottom to top
-    for filepath in result:
-        result[filepath].sort(key=lambda x: x.get('start_line', 0), reverse=True)
-    
+        result[filepath].append({
+            'filepath': filepath,
+            'start': start,
+            'end': end,
+            'content': content  # 保留原始内容（可能为空）
+        })
+    for filepath in result.keys():
+        result[filepath] = sorted(result[filepath], key=lambda x: x['start'], reverse=True)
     return result
 
 
 def apply_patch(output_str: str) -> str:
     """Apply patches to files"""
-    patches = _parse_patch(output_str)
-    ret = ""  # Initialize return value
-
-    for filepath, patch_info in patches.items():
-        try:
-            for patch in patch_info:
-                patch_type = patch['type']
-                
-                if patch_type == 'MOVE_FILE':
-                    handle_move_file(filepath, patch)
-                elif patch_type == 'NEW_FILE':
-                    handle_new_file(filepath, patch)
-                elif patch_type == 'REMOVE_FILE':
-                    handle_remove_file(filepath)
-                else:
-                    handle_code_operation(filepath, patch)
-            
-        except Exception as e:
-            PrettyOutput.print(f"应用 {patch_type} 操作到 {filepath} 失败: {str(e)}", OutputType.ERROR)
-            continue
+    try:
+        patches = _parse_patch(output_str)
+    except Exception as e:
+        PrettyOutput.print(f"解析补丁失败: {str(e)}", OutputType.ERROR)
+        return ""
 
+    ret = ""
+    
+    for filepath, patch_list in patches.items():
+        for patch in patch_list:
+            try:
+                handle_code_operation(filepath, patch)
+                PrettyOutput.print(f"成功处理 操作", OutputType.SUCCESS)
+            except Exception as e:
+                PrettyOutput.print(f"操作失败: {str(e)}", OutputType.ERROR)
+    
     if has_uncommitted_changes():
         diff = get_diff()
         if handle_commit_workflow(diff):
@@ -308,15 +194,25 @@ def apply_patch(output_str: str) -> str:
         if user_input:
             ret += "\n" + user_input
         else:
-            ret += "Please check the patch again"
+            ret = ""
 
     return ret  # Ensure a string is always returned
 
-def get_diff()->str:
-    os.system("git add .")
-    diff = os.popen("git diff HEAD").read()
-    os.system("git reset HEAD")
-    return diff
+def get_diff() -> str:
+    """使用更安全的subprocess代替os.system"""
+    import subprocess
+    try:
+        subprocess.run(['git', 'add', '.'], check=True)
+        result = subprocess.run(
+            ['git', 'diff', 'HEAD'],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        return result.stdout
+    finally:
+        subprocess.run(['git', 'reset', 'HEAD'], check=True)
+
 def handle_commit_workflow(diff:str)->bool:
     """Handle the git commit workflow and return the commit details.
     
@@ -324,9 +220,10 @@ def handle_commit_workflow(diff:str)->bool:
         tuple[bool, str, str]: (continue_execution, commit_id, commit_message)
     """
     if not user_confirm("是否要提交代码？", default=True):
-        os.system("git reset HEAD")
-        os.system("git checkout -- .")
-        os.system("git clean -fd")
+        import subprocess
+        subprocess.run(['git', 'reset', 'HEAD'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.run(['git', 'checkout', '--', '.'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.run(['git', 'clean', '-fd'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         return False
 
     git_commiter = GitCommitTool()
@@ -365,82 +262,62 @@ def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
     return result
 # New handler functions below ▼▼▼
 
-def handle_move_file(filepath: str, patch: Dict[str, Any]):
-    """Handle file moving operation"""
-    new_path = patch['new_path']
-    os.makedirs(os.path.dirname(new_path), exist_ok=True)
-    if os.path.exists(filepath):
-        os.rename(filepath, new_path)
-        PrettyOutput.print(f"成功移动文件 {filepath} -> {new_path}", OutputType.SUCCESS)
-    else:
-        PrettyOutput.print(f"源文件不存在: {filepath}", OutputType.WARNING)
-
 def handle_new_file(filepath: str, patch: Dict[str, Any]):
-    """Handle new file creation"""
-    new_content = patch.get('content', '').splitlines(keepends=True)
-    if new_content and new_content[-1] and new_content[-1][-1] != '\n':
-        new_content[-1] += '\n'
-    
+    """统一参数格式处理新文件"""
     os.makedirs(os.path.dirname(filepath), exist_ok=True)
     with open(filepath, 'w', encoding='utf-8') as f:
-        f.writelines(new_content)
-    PrettyOutput.print(f"成功创建新文件 {filepath}", OutputType.SUCCESS)
-
-def handle_remove_file(filepath: str):
-    """Handle file removal"""
-    if os.path.exists(filepath):
-        os.remove(filepath)
-        PrettyOutput.print(f"成功删除文件 {filepath}", OutputType.SUCCESS)
-    else:
-        PrettyOutput.print(f"文件不存在: {filepath}", OutputType.WARNING)
+        f.write(patch['content'])
 
 def handle_code_operation(filepath: str, patch: Dict[str, Any]):
-    """Handle code modification operations (REPLACE/INSERT/DELETE)"""
-    patch_type = patch['type']
-    start_line = patch.get('start_line', 0)
-    end_line = patch.get('end_line', 0)
-    new_content = patch.get('content', '').splitlines(keepends=True)
-
-    if not new_content:
-        new_content = ['']
-
-    PrettyOutput.print(f"patch_type: {patch_type}\nstart_line: {start_line}\nend_line: {end_line}\nnew_content:\n{''.join(new_content)}", OutputType.INFO)
-
-    if new_content and new_content[-1] and new_content[-1][-1] != '\n':
-        new_content[-1] += '\n'
-
-    if not os.path.exists(filepath):
-        PrettyOutput.print(f"文件不存在: {filepath}", OutputType.WARNING)
-        return
+    """处理紧凑格式补丁"""
+    try:
+        # 新建文件时强制覆盖
+        os.makedirs(os.path.dirname(filepath) or '.', exist_ok=True)
+        if not os.path.exists(filepath):
+            open(filepath, 'w', encoding='utf-8').close()
+        with open(filepath, 'r+', encoding='utf-8') as f:
+            lines = f.readlines()
+            
+            new_lines = validate_and_apply_changes(
+                lines,
+                patch['start'],
+                patch['end'],
+                patch['content']
+            )
+            
+            f.seek(0)
+            f.writelines(new_lines)
+            f.truncate()
 
-    with open(filepath, 'r+', encoding='utf-8') as f:
-        lines = f.readlines()
-        validate_and_apply_changes(patch_type, lines, start_line, end_line, new_content)
-        f.seek(0)
-        f.writelines(lines)
-        f.truncate()
+        PrettyOutput.print(f"成功更新 {filepath}", OutputType.SUCCESS)
 
-    PrettyOutput.print(f"成功对 {filepath} 执行 {patch_type} 操作", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"操作失败: {str(e)}", OutputType.ERROR)
 
 def validate_and_apply_changes(
-    patch_type: str,
     lines: List[str],
-    start_line: int,
-    end_line: int,
-    new_content: List[str]
-):
-    """Validate and apply code changes to in-memory file content"""
-    if patch_type in ['REPLACE', 'DELETE']:
-        if start_line < 1 or end_line > len(lines) or start_line > end_line:
-            raise ValueError(f"Invalid line range [{start_line}, {end_line}] (total lines: {len(lines)})")
-        
-        if patch_type == 'REPLACE':
-            lines[start_line-1:end_line] = new_content
-        else:  # DELETE
-            lines[start_line-1:end_line] = []
-            
-    elif patch_type == 'INSERT':
-        if start_line < 1 or start_line > len(lines) + 1:
-            raise ValueError(f"Invalid insertion position [{start_line}] (valid range: 1-{len(lines)+1})")
-        
-        lines[start_line-1:start_line-1] = new_content
+    start: int,
+    end: int,
+    content: str
+) -> List[str]:
+
+    new_content = content.splitlines(keepends=True)
+    
+    # 插入操作处理
+    if start == end:
+        if start < 1 or start > len(lines)+1:
+            raise ValueError(f"无效插入位置: {start}")
+        # 在指定位置前插入
+        return lines[:start-1] + new_content + lines[start-1:]
+    
+    # 范围替换/删除操作
+    if start > end:
+        raise ValueError(f"起始行{start}不能大于结束行{end}")
+    
+    max_line = len(lines)
+    # 自动修正行号范围
+    start = max(1, min(start, max_line+1))
+    end = max(start, min(end, max_line+1))
+    
+    # 执行替换
+    return lines[:start-1] + new_content + lines[end-1:]

jarvis/jarvis_code_agent/relevant_files.py

@@ -60,14 +60,12 @@ Identify customization options:
 - "Should we create a new class?"
 
 # 🎨 Question Template
-```
+3-5 specific questions about existing implementations:
 <QUESTION>
-[3-5 specific questions about existing implementations:
 1. System architecture question
 2. Implementation details question
-3. Integration or extension question]
+3. Integration or extension question
 </QUESTION>
-```
 
 # 🔎 Investigation Focus
 1. Current System