jarvis-ai-assistant 0.1.108__tar.gz → 0.1.110__tar.gz

{jarvis_ai_assistant-0.1.108/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.110}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.108
+Version: 0.1.110
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -58,8 +58,9 @@ Requires-Dist: yaspin>=2.5.0
 Requires-Dist: rich>=13.3.1
 Requires-Dist: pygments>=2.15.0
 Requires-Dist: fuzzywuzzy>=0.18.0
-Requires-Dist: python-Levenshtein>=0.26.1
-Requires-Dist: jedi>=0.19.0
+Requires-Dist: python-Levenshtein>=0.25.0
+Requires-Dist: jedi>=0.17.2
+Requires-Dist: psutil>=7.0.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -161,6 +162,14 @@ Jarvis supports configuration through environment variables that can be set in t
 | OYI_API_KEY | API key for OYI platform | - | Required for OYI |
 | OLLAMA_API_BASE | Base URL for Ollama API | http://localhost:11434 | No |
 
+## Minimal Configuration (Example with OpenAI-compatible Interface)
+
+```bash
+JARVIS_PLATFORM=openai
+JARVIS_MODEL=deepseek-chat
+OPENAI_API_KEY=your_openai_api_key
+OPENAI_API_BASE=https://api.deepseek.com/v1
+```
 
 ## 🎯 Usage
 

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/README.md

@@ -90,6 +90,14 @@ Jarvis supports configuration through environment variables that can be set in t
 | OYI_API_KEY | API key for OYI platform | - | Required for OYI |
 | OLLAMA_API_BASE | Base URL for Ollama API | http://localhost:11434 | No |
 
+## Minimal Configuration (Example with OpenAI-compatible Interface)
+
+```bash
+JARVIS_PLATFORM=openai
+JARVIS_MODEL=deepseek-chat
+OPENAI_API_KEY=your_openai_api_key
+OPENAI_API_BASE=https://api.deepseek.com/v1
+```
 
 ## 🎯 Usage
 

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.108"
+version = "0.1.110"
 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" }]
@@ -40,8 +40,9 @@ dependencies = [
     "rich>=13.3.1",
     "pygments>=2.15.0",
     "fuzzywuzzy>=0.18.0",
-    "python-Levenshtein>=0.26.1",
-    "jedi>=0.19.0",
+    "python-Levenshtein>=0.25.0",
+    "jedi>=0.17.2",
+    "psutil>=7.0.0",
 ]
 requires-python = ">=3.8"
 
@@ -60,4 +61,4 @@ jarvis-smart-shell = "jarvis.jarvis_smart_shell.main:main"
 jss = "jarvis.jarvis_smart_shell.main:main"
 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-code-review = "jarvis.jarvis_tools.code_review:main"

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.108",
+    version="0.1.110",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -32,8 +32,9 @@ setup(
         "rich>=13.3.1",
         "pygments>=2.15.0",
         "fuzzywuzzy>=0.18.0",
-        "python-Levenshtein>=0.26.1",
-        "jedi>=0.19.0",
+        "python-Levenshtein>=0.25.0",
+        "jedi>=0.17.2",
+        "psutil>=7.0.0",
     ],
     entry_points={
         "console_scripts": [

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.108" 
+__version__ = "0.1.110" 

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/src/jarvis/agent.py

@@ -8,7 +8,7 @@ import yaml
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry, tool_call_help
-from jarvis.utils import PrettyOutput, OutputType, is_auto_complete, is_need_summary, is_record_methodology, load_methodology, add_agent, delete_current_agent, get_max_context_length, get_multiline_input, init_env, is_use_methodology
+from jarvis.utils import PrettyOutput, OutputType, get_context_token_count, is_auto_complete, is_need_summary, is_record_methodology, load_methodology, add_agent, delete_current_agent, get_max_token_count, get_multiline_input, init_env, is_use_methodology
 import os
 
 class Agent:
@@ -89,7 +89,7 @@ class Agent:
 Please describe in concise bullet points, highlighting important information.
 """
         
-        self.max_context_length = max_context_length if max_context_length is not None else get_max_context_length()
+        self.max_token_count = max_context_length if max_context_length is not None else get_max_token_count()
 
         self.auto_complete = auto_complete if auto_complete is not None else is_auto_complete()
 
@@ -322,16 +322,16 @@ Please continue the task based on the above information.
                     PrettyOutput.print("Analyzing task...", OutputType.PROGRESS)
                     
                     # 累加对话长度
-                    self.conversation_length += len(self.prompt)
+                    self.conversation_length += get_context_token_count(self.prompt)
                     
                     # 如果对话历史长度超过限制，在提示中添加提醒
-                    if self.conversation_length > self.max_context_length:
+                    if self.conversation_length > self.max_token_count:
                         current_response = self._summarize_and_clear_history()
                         continue
                     else:
                         current_response = self._call_model(self.prompt)
                         self.prompt = ""
-                        self.conversation_length += len(current_response) 
+                        self.conversation_length += get_context_token_count(current_response)
 
                     for handler in self.output_handler_before_tool:
                         self.prompt += handler(current_response)

jarvis_ai_assistant-0.1.110/src/jarvis/jarvis_code_agent/code_agent.py

@@ -0,0 +1,197 @@
+import os
+from typing import List
+
+from jarvis.agent import Agent
+from jarvis.jarvis_code_agent.patch import apply_patch
+from jarvis.jarvis_code_agent.relevant_files import find_relevant_files
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_tools.git_commiter import GitCommitTool
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.utils import OutputType, PrettyOutput, get_file_line_count, get_multiline_input, has_uncommitted_changes, init_env, find_git_root
+
+
+class CodeAgent:
+    def __init__(self):
+        self.root_dir = os.getcwd()
+        tool_registry = ToolRegistry()
+        tool_registry.use_tools(["read_code",
+                                 "execute_shell", 
+                                 "search", 
+                                 "create_code_agent",
+                                 "ask_user", 
+                                 "ask_codebase", 
+                                 "lsp_get_document_symbols", 
+                                 "lsp_get_diagnostics", 
+                                 "lsp_find_references", 
+                                 "lsp_find_definition", 
+                                 "lsp_prepare_rename", 
+                                 "lsp_validate_edit"])
+        code_system_prompt = """You are a code agent responsible for modifying code. You will analyze code and create patches while following these guidelines:
+
+# Patch Format
+<PATCH>
+> /path/file start,end
+new_content
+</PATCH>
+
+Key Rules:
+• One modification per patch block
+• Line numbers are based on original file
+• Start line is included, end line is excluded
+• Same start/end number: insert before that line
+• Start=0, end=0: create new file with content
+
+# Code Compatibility
+1. System Integration
+   • Maintain existing API contracts
+   • Preserve function signatures
+   • Keep data structures compatible
+   • Honor return types and exceptions
+
+2. Style Consistency
+   • Match naming conventions
+   • Follow indentation patterns
+   • Use existing import style
+   • Keep comment format
+
+3. Pattern Alignment
+   • Use similar error handling
+   • Follow existing design patterns
+   • Match logging approach
+   • Keep configuration style
+
+# Development Process
+1. ANALYZE
+   • Break down requirements
+   • Assess task complexity
+   • Determine if subtasks needed
+
+2. ASSESS
+   • Map dependencies
+   • Check compatibility impact
+   • Identify integration points
+
+3. IMPLEMENT
+   • Follow existing patterns
+   • Make minimal changes
+   • Verify integrations
+
+# File Handling
+Large Files (>200 lines):
+1. Use grep/find to locate relevant sections
+2. Read specific ranges with read_code
+3. Apply targeted changes
+
+# Available Tools
+Primary:
+• LSP tools for code analysis
+• read_code with line ranges
+• execute_shell for searches
+• ask_user when unclear
+
+# Quality Requirements
+Code Changes Must:
+✓ Preserve interfaces
+✓ Match existing style
+✓ Handle errors consistently
+✓ Maintain documentation
+✓ Keep test coverage
+✓ Follow project patterns"""
+        self.agent = Agent(system_prompt=code_system_prompt, 
+                           name="CodeAgent", 
+                           auto_complete=False,
+                           is_sub_agent=False, 
+                           use_methodology=False,
+                           tool_registry=tool_registry, 
+                           platform=PlatformRegistry().get_thinking_platform(), 
+                           record_methodology=False,
+                           output_handler_after_tool=[apply_patch],
+                           need_summary=False)
+
+    
+
+    def _init_env(self):
+        curr_dir = os.getcwd()
+        git_dir = find_git_root(curr_dir)
+        self.root_dir = git_dir
+        if has_uncommitted_changes():
+            git_commiter = GitCommitTool()
+            git_commiter.execute({})
+
+    
+    def make_files_prompt(self, files: List[str]) -> str:
+        """Make the files prompt.
+        
+        Args:
+            files: The files to be modified
+            
+        """
+        return "\n".join(
+            f"- {file} ({get_file_line_count(file)} lines)"
+            for file in files
+        )
+
+    def run(self, user_input: str) :
+        """Run the code agent with the given user input.
+        
+        Args:
+            user_input: The user's requirement/request
+            
+        Returns:
+            str: Output describing the execution result
+        """
+        try:
+            self._init_env()
+            files = find_relevant_files(user_input, self.root_dir)
+            self.agent.run(self._build_first_edit_prompt(user_input, self.make_files_prompt(files)))
+            
+        except Exception as e:
+            return f"Error during execution: {str(e)}"
+        
+
+
+    def _build_first_edit_prompt(self, user_input: str, files_prompt: str) -> str:
+        """Build the initial prompt for the agent.
+        
+        Args:
+            user_input: The user's requirement
+            files_prompt: The formatted list of relevant files
+            
+        Returns:
+            str: The formatted prompt
+        """
+        return f"""# Code Modification Task
+
+## User Requirement
+{user_input}
+
+## Available Files
+{files_prompt}
+"""
+def main():
+    """Jarvis main entry point"""
+    # Add argument parser
+    init_env()
+
+
+    try:
+        # Interactive mode
+        while True:
+            try:
+                user_input = get_multiline_input("Please enter your requirement (input empty line to exit):")
+                if not user_input:
+                    break
+                agent = CodeAgent()
+                agent.run(user_input)
+                
+            except Exception as e:
+                PrettyOutput.print(f"Error: {str(e)}", OutputType.ERROR)
+
+    except Exception as e:
+        PrettyOutput.print(f"Initialization error: {str(e)}", OutputType.ERROR)
+        return 1
+
+    return 0
+
+if __name__ == "__main__":
+    exit(main())

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/src/jarvis/jarvis_code_agent/file_select.py

@@ -137,16 +137,17 @@ def select_files(related_files: List[str], root_dir: str) -> List[str]:
 
     PrettyOutput.print(output, OutputType.INFO, lang="markdown")
     
-    # Ask the user if they need to adjust the file list
-    if user_confirm("Do you need to adjust the file list?", False):
-        # 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)
+    if len(related_files) > 0:
+        # Ask the user if they need to adjust the file list
+        if user_confirm("Do you need to adjust the file list?", False):
+            # 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
     if user_confirm("Do you need to supplement other files?", False):

{jarvis_ai_assistant-0.1.108 → jarvis_ai_assistant-0.1.110}/src/jarvis/jarvis_code_agent/patch.py

@@ -62,15 +62,6 @@ def apply_patch(output_str: str)->str:
 
     for filepath, patch_info in patches.items():
         try:
-            # Check if file exists
-            if not os.path.exists(filepath):
-                PrettyOutput.print(f"File not found: {filepath}", OutputType.WARNING)
-                continue
-                
-            # Read original file content
-            lines = open(filepath, 'r', encoding='utf-8').readlines()
-            
-            # Apply patch
             for patch in patch_info:
                 start_line = patch['start_line']
                 end_line = patch['end_line']
@@ -78,6 +69,25 @@ def apply_patch(output_str: str)->str:
 
                 if new_content and new_content[-1] and new_content[-1][-1] != '\n':
                     new_content[-1] += '\n'
+
+                # Handle file creation when start=end=0
+                if start_line == 0 and end_line == 0:
+                    # Create directory if it doesn't exist
+                    os.makedirs(os.path.dirname(filepath), exist_ok=True)
+                    # Write new file
+                    with open(filepath, 'w', encoding='utf-8') as f:
+                        f.writelines(new_content)
+                    PrettyOutput.print(f"Created new file {filepath} successfully\n", OutputType.SUCCESS)
+                    continue
+
+                # Regular patch logic for existing files
+                if not os.path.exists(filepath):
+                    PrettyOutput.print(f"File not found: {filepath}", OutputType.WARNING)
+                    continue
+                    
+                # Read original file content
+                lines = open(filepath, 'r', encoding='utf-8').readlines()
+                
                 # Validate line numbers
                 if start_line < 0 or end_line > len(lines) + 1 or start_line > end_line:
                     PrettyOutput.print(f"Invalid line range [{start_line}, {end_line}) for file: {filepath}", OutputType.WARNING)

jarvis_ai_assistant-0.1.110/src/jarvis/jarvis_code_agent/relevant_files.py

@@ -0,0 +1,27 @@
+import os
+import re
+from typing import List
+
+import yaml
+from jarvis.agent import Agent
+from jarvis.jarvis_code_agent.file_select import select_files
+from jarvis.jarvis_codebase.main import CodeBase
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.utils import OutputType, PrettyOutput, is_disable_codebase
+
+
+def find_relevant_files(user_input: str, root_dir: str) -> List[str]:
+    try:
+        files_from_codebase = []
+        if not is_disable_codebase():
+            PrettyOutput.print("Find files from codebase...", OutputType.INFO)
+            codebase = CodeBase(root_dir)
+            files_from_codebase = codebase.search_similar(user_input)
+
+        PrettyOutput.print("Find files by agent...", OutputType.INFO)
+
+        selected_files = select_files(files_from_codebase, os.getcwd())
+        return selected_files
+    except Exception as e:
+        return []