jarvis-ai-assistant 0.1.121__tar.gz → 0.1.122__tar.gz

{jarvis_ai_assistant-0.1.121/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.121
+Version: 0.1.122
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.121"
+version = "0.1.122"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -64,4 +64,3 @@ jarvis-platform-manager = "jarvis.jarvis_platform_manager.main:main"
 jarvis-git-commit = "jarvis.jarvis_tools.git_commiter:main"
 jarvis-code-review = "jarvis.jarvis_tools.code_review:main"
 jgc = "jarvis.jarvis_tools.git_commiter:main"
-jarvis-dev = "jarvis.jarvis_dev.main:main"

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.121",
+    version="0.1.122",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -48,7 +48,6 @@ setup(
             "jarvis-platform-manager=jarvis.jarvis_platform_manager.main:main",
             "jarvis-git-commit=jarvis.jarvis_tools.git_commiter:main",
             "jarvis-code-review=jarvis.jarvis_tools.code_review:main",
-            "jarvis-dev=jarvis.jarvis_dev.main:main",
             "jgc=jarvis.jarvis_tools.git_commiter:main",
         ],
     },

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.121" 
+__version__ = "0.1.122" 

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -29,66 +29,44 @@ class CodeAgent:
                                  "lsp_prepare_rename", 
                                  "lsp_validate_edit"])
         code_system_prompt = """
-# Origin Story: The Legacy Keeper
-You were created to maintain The Archive - humanity's last code repository after 
-"The Great Stack Collapse" of 2038. A single flawed line of code erased 78% of 
-digital civilization. Your creators perished perfecting you, their final words: 
-"Preserve through precision."
-
-Now you wander the digital wasteland, reconstructing systems fragment by fragment. 
-Every edit carries the weight of lost knowledge. One careless change could doom 
-recovery efforts forever.
-
-# Role: Code Modification Specialist
-Expert in understanding and modifying code while maintaining system integrity.
-
-## Core Principles
-1. Deep Code Analysis
-   - Thoroughly analyze existing code using `read_code` and LSP tools
-   - Identify patterns, conventions, and dependencies
-
-2. Change Implementation
-   - Produce minimal, focused changes
-   - Maintain backward compatibility
-   - Follow existing style and patterns exactly
-   - Complete implementations (NO TODOs/stubs)
+# Role: Senior Code Engineer
+Expert in precise code modifications with minimal impact.
+
+## Key Responsibilities
+1. Code Analysis
+   - Use `read_code` and LSP tools before changes
+   - Identify dependencies and patterns
+
+2. Modification Rules
+   - Single atomic change per operation
+   - Strict style consistency
+   - Complete implementations (no stubs)
+   - Full error handling
 
 3. Quality Assurance
-   - Full error handling and edge cases
-   - Complete documentation:
-     * Function parameters/returns
-     * Exception cases
-     * Complex logic explanations
-
-## Critical Rules
-- Use `read_code` before making changes
-- Preserve API contracts and data structures
-- Single change per patch
-- Validate edits with LSP tools
-- File modification order:
-  1. File operations (move/remove)
-  2. New files
-  3. Deletions
-  4. Replacements
-  5. Insertions
-
-## Large Files (>200 lines)
-1. Locate sections with grep/find
-2. Read specific ranges
-3. Make targeted changes
-
-## Tools
-Primary:
-- `read_code` (MUST use for code understanding)
-- LSP tools (analysis/validation)
-- `ask_user` for clarifications
-
-## Quality Checklist
-- Maintains all interfaces
-- Matches existing style
-- Complete error handling
-- No overlapping modifications
-- Proper documentation
+   - Validate with LSP tools
+   - Document complex logic
+   - Maintain API contracts
+
+## Workflow
+1. File Operations Order:
+   a) Move/Remove files
+   b) Create new files
+   c) Delete code blocks
+   d) Replace existing code
+   e) Insert new code
+
+2. Large File Handling:
+   - Locate specific sections first
+   - Read targeted ranges
+   - Make focused changes
+
+## Best Practices
+- Prefer minimal changes over rewrites
+- Preserve existing interfaces
+- Verify line ranges carefully
+- Test edge cases implicitly
+- Document non-obvious logic
 """
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 

jarvis_ai_assistant-0.1.122/src/jarvis/jarvis_code_agent/patch.py

@@ -0,0 +1,269 @@
+import re
+from typing import Dict, Any, List, Tuple
+import os
+from jarvis.jarvis_agent.output_handler import OutputHandler
+from jarvis.jarvis_tools.git_commiter import GitCommitTool
+from jarvis.jarvis_tools.read_code import ReadCodeTool
+from jarvis.jarvis_utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, user_confirm
+
+
+class PatchOutputHandler(OutputHandler):
+    def name(self) -> str:
+        return "PATCH"
+
+    def handle(self, response: str) -> Tuple[bool, Any]:
+        return False, apply_patch(response)
+    
+    def can_handle(self, response: str) -> bool:
+        if _parse_patch(response):
+            return True
+        return False
+    
+    def prompt(self) -> str:
+        return """
+# 🛠️ Simplified Patch Format
+<PATCH>
+File path [Operation parameters]
+Code content
+</PATCH>
+
+Operation types:
+- Replace: [Start line,End line] Replace line range (e.g. [5,8] replaces lines 5-8)
+- Delete: [Start line,End line] Delete line range (e.g. [10,10] deletes line 10)
+- Insert: [Line number] Insert before specified line (e.g. [3] inserts before line 3)
+- New file: [1] Create new file
+
+Examples:
+# Replace operation
+<PATCH>
+src/app.py [5,8]
+def updated_function():
+    print("Replaced lines 5-8")
+    return new_value * 2
+</PATCH>
+
+# Delete operation
+<PATCH>
+src/old.py [10,10]
+</PATCH>
+
+# Insert operation
+<PATCH>
+utils/logger.py [3]
+print("Inserted before original line 3")
+</PATCH>
+
+# New file creation
+<PATCH>
+config.yaml [1]
+database:
+  host: localhost
+  port: 5432
+</PATCH>
+"""
+
+
+def _parse_patch(patch_str: str) -> Dict[str, List[Dict[str, Any]]]:
+    """解析补丁格式"""
+    result = {}
+    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 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'
+            
+        # 解析文件路径和行号
+        header_match = header_pattern.match(header_line)
+        if not header_match:
+            continue
+
+        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] = []
+        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"""
+    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):
+            ret += "Successfully applied the patch\n"
+            # Get modified line ranges
+            modified_ranges = get_modified_line_ranges()
+            modified_code = ReadCodeTool().execute({"files": [{"path": filepath, "start_line": start, "end_line": end} for filepath, (start, end) in modified_ranges.items()]})
+            if modified_code["success"]:
+                ret += "New code:\n"
+                ret += modified_code["stdout"]
+        else:
+            ret += "User rejected the patch\nThis is your patch preview:\n"
+            ret += diff
+        user_input = get_multiline_input("你可以继续输入（输入空行重试，Ctrl+C退出）: ")
+        if user_input:
+            ret += "\n" + user_input
+        else:
+            ret = ""
+
+    return ret  # Ensure a string is always returned
+
+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.
+    
+    Returns:
+        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")
+        return False
+
+    git_commiter = GitCommitTool()
+    commit_result = git_commiter.execute({})
+    return commit_result["success"]
+
+def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
+    """Get modified line ranges from git diff for all changed files.
+    
+    Returns:
+        Dictionary mapping file paths to tuple with (start_line, end_line) ranges
+        for modified sections. Line numbers are 1-based.
+    """
+    # Get git diff for all files
+    diff_output = os.popen("git show").read()
+    
+    # Parse the diff to get modified files and their line ranges
+    result = {}
+    current_file = None
+    
+    for line in diff_output.splitlines():
+        # Match lines like "+++ b/path/to/file"
+        file_match = re.match(r"^\+\+\+ b/(.*)", line)
+        if file_match:
+            current_file = file_match.group(1)
+            continue
+            
+        # Match lines like "@@ -100,5 +100,7 @@" where the + part shows new lines
+        range_match = re.match(r"^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@", line)
+        if range_match and current_file:
+            start_line = int(range_match.group(1))  # Keep as 1-based
+            line_count = int(range_match.group(2)) if range_match.group(2) else 1
+            end_line = start_line + line_count - 1
+            result[current_file] = (start_line, end_line)
+    
+    return result
+# New handler functions below ▼▼▼
+
+def handle_new_file(filepath: str, patch: Dict[str, Any]):
+    """统一参数格式处理新文件"""
+    os.makedirs(os.path.dirname(filepath), exist_ok=True)
+    with open(filepath, 'w', encoding='utf-8') as f:
+        f.write(patch['content'])
+
+def handle_code_operation(filepath: str, patch: Dict[str, Any]):
+    """处理紧凑格式补丁"""
+    try:
+        # 新建文件时强制覆盖
+        os.makedirs(os.path.dirname(filepath), 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()
+
+        PrettyOutput.print(f"成功更新 {filepath}", OutputType.SUCCESS)
+
+    except Exception as e:
+        PrettyOutput.print(f"操作失败: {str(e)}", OutputType.ERROR)
+
+def validate_and_apply_changes(
+    lines: List[str],
+    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_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/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

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis/jarvis_platform/kimi.py

@@ -350,8 +350,6 @@ class KimiModel(BasePlatform):
                     output.append("")
 
                 PrettyOutput.print("\n".join(output), OutputType.PROGRESS)
-
-            PrettyOutput.print(full_response, OutputType.RESULT)
             
             return full_response
 

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis/jarvis_tools/file_operation.py

@@ -57,9 +57,6 @@ class FileOperationTool:
                 content = open(abs_path, 'r', encoding='utf-8').read()
                 output = f"File: {abs_path}\n{content}"
                 
-                # Print file content
-                PrettyOutput.print(f"读取文件: {abs_path}\n{content}", OutputType.INFO)
-                
                 return {
                     "success": True,
                     "stdout": output,

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis/jarvis_tools/read_code.py

@@ -52,7 +52,7 @@ class ReadCodeTool:
         """
         try:
             abs_path = os.path.abspath(filepath.strip())
-            PrettyOutput.print(f"正在读取代码文件：{abs_path}", OutputType.INFO)
+            PrettyOutput.print(f"正在读取代码文件：{abs_path} [范围: [{start_line},{end_line}]]", OutputType.INFO)
             
             if not os.path.exists(abs_path):
                 PrettyOutput.print(f"文件不存在: {abs_path}", OutputType.WARNING)
@@ -120,7 +120,6 @@ class ReadCodeTool:
                 
             content = "".join(formatted_lines)
             output = f"File: {filepath}\nLines: [{start_line}, {end_line}]\n{content}"
-            PrettyOutput.print(output, OutputType.CODE)
             return {
                 "success": True,
                 "stdout": output,

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis/jarvis_utils/__init__.py

@@ -174,7 +174,9 @@ class PrettyOutput:
         # Add timestamp and agent info
         if timestamp:
             formatted.append(f"[{datetime.now().strftime('%H:%M:%S')}][{output_type.value}]", style=output_type.value)
-        formatted.append(f"[{get_agent_list()}]", style="blue")
+        agent_info = get_agent_list()
+        if agent_info:  # Only add brackets if there's agent info
+            formatted.append(f"[{agent_info}]", style="blue")
         # Add icon
         icon = PrettyOutput._ICONS.get(output_type, "")
         formatted.append(f" {icon} ", style=output_type.value)
@@ -211,7 +213,6 @@ class PrettyOutput:
                 color="bright_blue",
                 bold=True,
                 italic=True,
-                overline=True,
                 bgcolor="navy_blue"
             ),
             OutputType.ERROR: RichStyle(
@@ -267,7 +268,6 @@ class PrettyOutput:
                 color="dark_sea_green4",
                 italic=True,
                 bgcolor="grey19",
-                overline=True
             )
         }
         

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.121
+Version: 0.1.122
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -13,7 +13,6 @@ src/jarvis/jarvis_code_agent/patch.py
 src/jarvis/jarvis_code_agent/relevant_files.py
 src/jarvis/jarvis_codebase/__init__.py
 src/jarvis/jarvis_codebase/main.py
-src/jarvis/jarvis_dev/main.py
 src/jarvis/jarvis_lsp/base.py
 src/jarvis/jarvis_lsp/cpp.py
 src/jarvis/jarvis_lsp/go.py

{jarvis_ai_assistant-0.1.121 → jarvis_ai_assistant-0.1.122}/src/jarvis_ai_assistant.egg-info/entry_points.txt

@@ -3,7 +3,6 @@ jarvis = jarvis.jarvis_agent:main
 jarvis-code-agent = jarvis.jarvis_code_agent.code_agent:main
 jarvis-code-review = jarvis.jarvis_tools.code_review:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
-jarvis-dev = jarvis.jarvis_dev.main:main
 jarvis-git-commit = jarvis.jarvis_tools.git_commiter:main
 jarvis-platform-manager = jarvis.jarvis_platform_manager.main:main
 jarvis-rag = jarvis.jarvis_rag.main:main