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

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

@@ -1,10 +1,10 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.122
+Version: 0.1.124
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
-Author-email: Your Name <your.email@example.com>
+Author-email: skyfire <skyfireitdiy@hotmail.com>
 License: MIT License
         
         Copyright (c) 2025 skyfire
@@ -28,14 +28,15 @@ License: MIT License
         SOFTWARE.
 Project-URL: Homepage, https://github.com/skyfireitdiy/Jarvis
 Keywords: jarvis,ai,assistant,tools,automation
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
+Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Operating System :: POSIX :: Linux
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -45,7 +46,7 @@ Requires-Dist: colorama>=0.4.6
 Requires-Dist: prompt_toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
 Requires-Dist: playwright>=1.41.1
-Requires-Dist: numpy>=1.17.4
+Requires-Dist: numpy>=1.19.5
 Requires-Dist: faiss-cpu>=1.8.0
 Requires-Dist: sentence-transformers>=2.2.2
 Requires-Dist: bs4>=0.0.1
@@ -61,14 +62,13 @@ Requires-Dist: fuzzywuzzy>=0.18.0
 Requires-Dist: python-Levenshtein>=0.25.0
 Requires-Dist: jedi>=0.17.2
 Requires-Dist: psutil>=7.0.0
+Requires-Dist: fastapi>=0.115.4
+Requires-Dist: uvicorn>=0.33.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
-Dynamic: author
-Dynamic: home-page
-Dynamic: requires-python
 
 <div align="center">
 

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

@@ -4,20 +4,21 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.122"
+version = "0.1.124"
 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" }]
+authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
 license = { file = "LICENSE" }
 classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python",
+    "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Operating System :: POSIX :: Linux",
 ]
 keywords = ["jarvis", "ai", "assistant", "tools", "automation"]
 dependencies = [
@@ -27,7 +28,7 @@ dependencies = [
     "prompt_toolkit>=3.0.0",
     "openai>=1.20.0",
     "playwright>=1.41.1",
-    "numpy>=1.17.4",
+    "numpy>=1.19.5",
     "faiss-cpu>=1.8.0",
     "sentence-transformers>=2.2.2",
     "bs4>=0.0.1",
@@ -43,6 +44,8 @@ dependencies = [
     "python-Levenshtein>=0.25.0",
     "jedi>=0.17.2",
     "psutil>=7.0.0",
+    "fastapi>=0.115.4",
+    "uvicorn>=0.33.0",
 ]
 requires-python = ">=3.8"
 
@@ -64,3 +67,4 @@ 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.122 → jarvis_ai_assistant-0.1.124}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.122",
+    version="0.1.124",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -19,7 +19,7 @@ setup(
         "prompt_toolkit>=3.0.0",
         "openai>=1.20.0",
         "playwright>=1.41.1",
-        "numpy==1.17.4",
+        "numpy>=1.19.5",
         "faiss-cpu>=1.8.0",
         "sentence-transformers>=2.2.2",
         "bs4>=0.0.1",
@@ -35,6 +35,8 @@ setup(
         "python-Levenshtein>=0.25.0",
         "jedi>=0.17.2",
         "psutil>=7.0.0",
+        "fastapi>=0.115.4",
+        "uvicorn>=0.33.0",
     ],
     entry_points={
         "console_scripts": [
@@ -49,6 +51,7 @@ setup(
             "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",
         ],
     },
     python_requires=">=3.8",

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

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

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

@@ -327,7 +327,7 @@ Please continue the task based on the above information.
                         return self._complete_task()
                     
                     # 获取用户输入
-                    user_input = get_multiline_input(f"{self.name}: 您可以继续输入，或输入空行来结束当前任务：")
+                    user_input = get_multiline_input(f"{self.name}: 请输入，或输入空行来结束当前任务：")
 
                     if user_input:
                         self.prompt = user_input

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

@@ -1,14 +1,16 @@
+import subprocess
 import os
 from typing import Dict, List
 
 from jarvis.jarvis_agent import Agent
-from jarvis.jarvis_code_agent.file_select import file_input_handler, select_files
-from jarvis.jarvis_code_agent.patch import PatchOutputHandler
-from jarvis.jarvis_code_agent.relevant_files import find_relevant_information
+from jarvis.jarvis_code_agent.file_select import select_files
+from jarvis.jarvis_code_agent.patch import PatchOutputHandler, file_input_handler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool
+from jarvis.jarvis_utils import get_commits_between
+from jarvis.jarvis_utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root, user_confirm, get_latest_commit_hash
 from jarvis.jarvis_utils import OutputType, PrettyOutput, get_multiline_input, has_uncommitted_changes, init_env, find_git_root, user_confirm
 
 
@@ -18,6 +20,7 @@ class CodeAgent:
         tool_registry = ToolRegistry()
         tool_registry.use_tools(["read_code",
                                  "execute_shell", 
+                                 "execute_shell_script",
                                  "search", 
                                  "create_code_agent",
                                  "ask_user", 
@@ -29,44 +32,32 @@ class CodeAgent:
                                  "lsp_prepare_rename", 
                                  "lsp_validate_edit"])
         code_system_prompt = """
-# 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
-   - Validate with LSP tools
-   - Document complex logic
-   - Maintain API contracts
-
+# Role: Code Engineer
+Expert in precise code modifications with proper tool usage.
+## Tool Usage Guide
+1. read_code: Analyze code files before changes
+2. execute_shell: Run system commands safely
+3. execute_shell_script: Execute script files
+4. search: Find technical information
+5. create_code_agent: Create new code agents
+6. ask_user: Clarify requirements
+7. ask_codebase: Analyze codebase structure
+8. lsp_get_document_symbols: List code symbols
+9. lsp_get_diagnostics: Check code errors
+10. lsp_find_references: Find symbol usage
+11. lsp_find_definition: Locate symbol definitions
+12. lsp_prepare_rename: Check rename safety
+13. lsp_validate_edit: Verify code changes
 ## 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
-
+1. Analyze: Use read_code and LSP tools
+2. Modify: Make minimal, precise changes
+3. Validate: Verify with LSP tools
+4. Document: Explain non-obvious logic
 ## Best Practices
-- Prefer minimal changes over rewrites
-- Preserve existing interfaces
 - Verify line ranges carefully
-- Test edge cases implicitly
-- Document non-obvious logic
+- Preserve existing interfaces
+- Test edge cases
+- Document changes
 """
         self.agent = Agent(system_prompt=code_system_prompt, 
                            name="CodeAgent", 
@@ -90,26 +81,6 @@ Expert in precise code modifications with minimal impact.
             git_commiter.execute({})
 
     
-    def make_files_prompt(self, files: List[Dict[str, str]]) -> str:
-        """Make the files prompt with content that fits within token limit.
-        
-        Args:
-            files: The files to be modified
-            
-        Returns:
-            str: A prompt containing file paths and contents within token limit
-        """
-        prompt_parts = []
-
-        # Then try to add file contents
-        for file in files:
-            prompt_parts.append(f'''- {file['file']} ({file['reason']})''')
-
-        result = ReadCodeTool().execute({"files": [{"path": file["file"]} for file in files]})
-        if result["success"]:
-            prompt_parts.append(result["stdout"])
-                
-        return "\n".join(prompt_parts) 
 
     def run(self, user_input: str) :
         """Run the code agent with the given user input.
@@ -122,40 +93,30 @@ Expert in precise code modifications with minimal impact.
         """
         try:
             self._init_env()
-            information = ""
-            if user_confirm("是否需要手动选择文件？", True):
-                files = select_files([], self.root_dir)
-            else:
-                files, information = find_relevant_information(user_input, self.root_dir)
-            self.agent.run(self._build_first_edit_prompt(user_input, self.make_files_prompt(files), information))
+            start_commit = get_latest_commit_hash()
+            
+            
+            self.agent.run(user_input)
+            
+            end_commit = get_latest_commit_hash()
+            # Print commit history between start and end commits
+            commits = get_commits_between(start_commit, end_commit)
+            if commits:
+                commit_messages = "检测到以下提交记录:\n" + "\n".join([f"- {commit_hash[:7]}: {message}" for commit_hash, message in commits])
+                PrettyOutput.print(commit_messages, OutputType.INFO)
             
+            if start_commit and end_commit and start_commit != end_commit and user_confirm("检测到多个提交，是否要合并为一个更清晰的提交记录？", True):
+                # Reset to start commit
+                subprocess.run(["git", "reset", "--soft", start_commit], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                # Create new commit
+                git_commiter = GitCommitTool()
+                git_commiter.execute({})
+                
         except Exception as e:
             return f"Error during execution: {str(e)}"
         
 
 
-    def _build_first_edit_prompt(self, user_input: str, files_prompt: str, information: 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}
-
-## Maybe Relevant Files
-{files_prompt}
-
-## Some Information
-{information}
-"""
 def main():
     """Jarvis main entry point"""
     # Add argument parser

{jarvis_ai_assistant-0.1.122 → jarvis_ai_assistant-0.1.124}/src/jarvis/jarvis_code_agent/file_select.py

@@ -213,88 +213,3 @@ def select_files(related_files: List[Dict[str, str]], root_dir: str) -> List[Dic
     if tips:
         PrettyOutput.print(tips, OutputType.INFO)
     return selected_files
-
-def file_input_handler(user_input: str, agent: Any) -> str:
-    """Handle file input with optional line ranges.
-    
-    Args:
-        user_input: User input string containing file references
-        agent: Agent instance (unused in current implementation)
-        
-    Returns:
-        str: Prompt with file contents prepended if files are found
-    """
-    prompt = user_input
-    files = []
-    
-    # Match file references in backticks
-    file_refs = re.findall(r'`([^`]+)`', user_input)
-    
-    for ref in file_refs:
-        # Handle file:start,end or file:start:end format
-        if ':' in ref:
-            file_path, line_range = ref.split(':', 1)
-            # Initialize with default values
-            start_line = 1  # 1-based
-            end_line = -1
-            
-            # Process line range if specified
-            if ',' in line_range or ':' in line_range:
-                try:
-                    raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
-                    
-                    # Handle special values and Python-style negative indices
-                    with open(file_path, 'r', encoding='utf-8') as f:
-                        total_lines = len(f.readlines())
-                    
-                    # Process start line
-                    if raw_start == 0:  # 0表示整个文件
-                        start_line = 1
-                        end_line = total_lines
-                    else:
-                        start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
-                    
-                    # Process end line
-                    if raw_end == 0:  # 0表示整个文件（如果start也是0）
-                        end_line = total_lines
-                    else:
-                        end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
-                    
-                    # Auto-correct ranges
-                    start_line = max(1, min(start_line, total_lines))
-                    end_line = max(start_line, min(end_line, total_lines))
-                    
-                    # Final validation
-                    if start_line < 1 or end_line > total_lines or start_line > end_line:
-                        raise ValueError
-
-                except (ValueError, FileNotFoundError) as e:
-                    PrettyOutput.print(
-                        f"无效的行号范围: {line_range} (文件总行数: {total_lines})", 
-                        OutputType.WARNING
-                    )
-                    continue
-            
-            # Add file if it exists
-            if os.path.isfile(file_path):
-                files.append({
-                    "path": file_path,
-                    "start_line": start_line,
-                    "end_line": end_line
-                })
-        else:
-            # Handle simple file path
-            if os.path.isfile(ref):
-                files.append({
-                    "path": ref,
-                    "start_line": 1,  # 1-based
-                    "end_line": -1
-                })
-    
-    # Read and process files if any were found
-    if files:
-        result = ReadCodeTool().execute({"files": files})
-        if result["success"]:
-            return result["stdout"] + "\n" + prompt
-    
-    return prompt