jarvis-ai-assistant 0.1.99__tar.gz → 0.1.101__tar.gz

{jarvis_ai_assistant-0.1.99/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.99
+Version: 0.1.101
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -125,7 +125,7 @@ pip install jarvis-ai-assistant
 
 ## 🔧 Configuration
 
-Jarvis supports configuration through environment variables that can be set in the `~/.jarvis_env` file:
+Jarvis supports configuration through environment variables that can be set in the `~/.jarvis/env` file:
 
 | Environment Variable | Description | Default Value | Required |
 |---------|------|--------|------|
@@ -204,7 +204,7 @@ jarvis-search "your query" --max 3
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
-- User tools: `~/.jarvis_tools/`
+- User tools: `~/.jarvis/tools/`
 
 
 ### Key Features
@@ -241,7 +241,7 @@ jarvis-search "your query" --max 3
 
 ### Adding New Tools
 
-Create a new Python file in `~/.jarvis_tools/` or `src/jarvis/tools/`:
+Create a new Python file in `~/.jarvis/tools/` or `src/jarvis/tools/`:
 
 ```python
 from typing import Dict, Any
@@ -273,7 +273,6 @@ class CustomTool:
                 "success": bool,
                 "stdout": str,  # On success
                 "stderr": str,  # Optional error details
-                "error": str    # On failure
             }
         """
         try:
@@ -281,18 +280,20 @@ class CustomTool:
             result = "Tool execution result"
             return {
                 "success": True,
-                "stdout": result
+                "stdout": result,
+                "stderr": ""
             }
         except Exception as e:
             return {
                 "success": False,
-                "error": str(e)
+                "stdout": "",
+                "stderr": str(e)
             }
 ```
 
 ### Adding New Models
 
-Create a new Python file in `~/.jarvis_models/`:
+Create a new Python file in `~/.jarvis/models/`:
 
 ```python
 from typing import Dict, List

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/README.md

@@ -59,7 +59,7 @@ pip install jarvis-ai-assistant
 
 ## 🔧 Configuration
 
-Jarvis supports configuration through environment variables that can be set in the `~/.jarvis_env` file:
+Jarvis supports configuration through environment variables that can be set in the `~/.jarvis/env` file:
 
 | Environment Variable | Description | Default Value | Required |
 |---------|------|--------|------|
@@ -138,7 +138,7 @@ jarvis-search "your query" --max 3
 
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
-- User tools: `~/.jarvis_tools/`
+- User tools: `~/.jarvis/tools/`
 
 
 ### Key Features
@@ -175,7 +175,7 @@ jarvis-search "your query" --max 3
 
 ### Adding New Tools
 
-Create a new Python file in `~/.jarvis_tools/` or `src/jarvis/tools/`:
+Create a new Python file in `~/.jarvis/tools/` or `src/jarvis/tools/`:
 
 ```python
 from typing import Dict, Any
@@ -207,7 +207,6 @@ class CustomTool:
                 "success": bool,
                 "stdout": str,  # On success
                 "stderr": str,  # Optional error details
-                "error": str    # On failure
             }
         """
         try:
@@ -215,18 +214,20 @@ class CustomTool:
             result = "Tool execution result"
             return {
                 "success": True,
-                "stdout": result
+                "stdout": result,
+                "stderr": ""
             }
         except Exception as e:
             return {
                 "success": False,
-                "error": str(e)
+                "stdout": "",
+                "stderr": str(e)
             }
 ```
 
 ### Adding New Models
 
-Create a new Python file in `~/.jarvis_models/`:
+Create a new Python file in `~/.jarvis/models/`:
 
 ```python
 from typing import Dict, List

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.99"
+version = "0.1.101"
 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" }]

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.99",
+    version="0.1.101",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.99" 
+__version__ = "0.1.101" 

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/src/jarvis/agent.py

@@ -8,7 +8,7 @@ import yaml
 from jarvis.models.registry import PlatformRegistry
 from jarvis.tools import ToolRegistry
 from jarvis.tools.registry import load_tools
-from jarvis.utils import PrettyOutput, OutputType, get_single_line_input, load_methodology, add_agent, delete_current_agent, get_max_context_length, get_multiline_input, load_embedding_model, load_env_from_file
+from jarvis.utils import PrettyOutput, OutputType, get_single_line_input, load_methodology, add_agent, delete_current_agent, get_max_context_length, get_multiline_input, load_embedding_model, init_env
 import os
 
 class Agent:
@@ -330,8 +330,8 @@ def load_tasks() -> dict:
     """Load tasks from .jarvis files in user home and current directory."""
     tasks = {}
     
-    # Check .jarvis in user directory
-    user_jarvis = os.path.expanduser("~/.jarvis")
+    # Check .jarvis/pre-command in user directory
+    user_jarvis = os.path.expanduser("~/.jarvis/pre-command")
     if os.path.exists(user_jarvis):
         try:
             with open(user_jarvis, "r", encoding="utf-8") as f:
@@ -343,14 +343,14 @@ def load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("Warning: ~/.jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+                PrettyOutput.print("Warning: ~/.jarvis/pre-command file should contain a dictionary of task_name: task_description", OutputType.ERROR)
         except Exception as e:
-            PrettyOutput.print(f"Error loading ~/.jarvis file: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"Error loading ~/.jarvis/pre-command file: {str(e)}", OutputType.ERROR)
     
-    # Check .jarvis in current directory
-    if os.path.exists(".jarvis"):
+    # Check .jarvis/pre-command in current directory
+    if os.path.exists(".jarvis/pre-command"):
         try:
-            with open(".jarvis", "r", encoding="utf-8") as f:
+            with open(".jarvis/pre-command", "r", encoding="utf-8") as f:
                 local_tasks = yaml.safe_load(f)
                 
             if isinstance(local_tasks, dict):
@@ -359,12 +359,12 @@ def load_tasks() -> dict:
                     if desc:  # Ensure description is not empty
                         tasks[str(name)] = str(desc)
             else:
-                PrettyOutput.print("Warning: .jarvis file should contain a dictionary of task_name: task_description", OutputType.ERROR)
+                PrettyOutput.print("Warning: .jarvis/pre-command file should contain a dictionary of task_name: task_description", OutputType.ERROR)
         except Exception as e:
-            PrettyOutput.print(f"Error loading .jarvis file: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print(f"Error loading .jarvis/pre-command file: {str(e)}", OutputType.ERROR)
 
     # Read methodology
-    method_path = os.path.expanduser("~/.jarvis_methodology")
+    method_path = os.path.expanduser("~/.jarvis/methodology")
     if os.path.exists(method_path):
         with open(method_path, "r", encoding="utf-8") as f:
             methodology = yaml.safe_load(f)
@@ -452,7 +452,7 @@ Strict Rules:
 def main():
     """Jarvis main entry point"""
     # Add argument parser
-    load_env_from_file()
+    init_env()
     parser = argparse.ArgumentParser(description='Jarvis AI assistant')
     parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
     args = parser.parse_args()

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/src/jarvis/jarvis_code_agent/main.py

@@ -1,5 +1,6 @@
 from jarvis.agent import Agent
-from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, load_env_from_file
+from jarvis.tools.registry import ToolRegistry
+from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, init_env
 
 
 
@@ -9,6 +10,10 @@ system_prompt = """You are Jarvis Code Agent, an AI code development assistant s
 DEVELOPMENT WORKFLOW:
 1. Task Analysis
    - Understand the requirements thoroughly
+   - IMPORTANT: Before suggesting any changes:
+     * Thoroughly examine existing code implementation
+     * Never assume code structure or implementation details
+     * Always verify current code behavior and patterns
    - Break down complex tasks into subtasks
    - IMPORTANT: Each subtask should:
      * Modify only ONE file
@@ -18,7 +23,8 @@ DEVELOPMENT WORKFLOW:
 
 2. Code Discovery & Analysis
    - Initial code search:
-     * Use shell commands to find patterns:
+     * CRITICAL: Always examine actual code implementation first
+     * Use shell commands to find and understand patterns:
        <TOOL_CALL>
        name: execute_shell
        arguments:
@@ -42,13 +48,6 @@ DEVELOPMENT WORKFLOW:
            command: head -n 50 file.py
        </TOOL_CALL>
    - File selection and confirmation:
-     * Find relevant files:
-       <TOOL_CALL>
-       name: find_related_files
-       arguments:
-           query: Need to modify user authentication
-           top_k: 5
-       </TOOL_CALL>
      * Let user confirm selection:
        <TOOL_CALL>
        name: select_code_files
@@ -58,18 +57,14 @@ DEVELOPMENT WORKFLOW:
                - user.py
            root_dir: .
        </TOOL_CALL>
-   - Detailed code examination:
-     * Understand code context:
-       <TOOL_CALL>
-       name: codebase_qa
-       arguments:
-           query: How does the authentication process work?
-           files:
-               - auth.py
-       </TOOL_CALL>
 
 3. Modification Planning
-   Generate a detailed modification plan based on user requirements and actual code conditions.
+   - CRITICAL: Base all plans on actual code implementation, not assumptions
+   - Generate a detailed modification plan based on:
+     * Current code structure and patterns
+     * Existing implementation details
+     * User requirements
+     * Actual code conditions
 
 4. Code Implementation
    - For small changes (≤20 lines):
@@ -90,7 +85,7 @@ DEVELOPMENT WORKFLOW:
 
 FILE SELECTION WORKFLOW:
 1. Initial Search
-   - Use codebase_search to find relevant files
+   - Use shell commands to find relevant files
    - Review search results for relevance
 
 2. User Confirmation
@@ -147,10 +142,8 @@ ITERATION GUIDELINES:
 TOOL USAGE:
 1. Analysis Tools:
    - execute_shell: Run grep/find/head/tail commands
-   - codebase_search: Find relevant files
-   - find_related_files: Find relevant files
+   - find_files: Search and identify relevant code files in the codebase based on requirements or problems
    - select_code_files: Confirm and supplement files
-   - codebase_qa: Understand context
    - ask_user: Ask user for confirmation and information if needed
    - create_code_sub_agent: Create agent for each small change
    - file_operation: Read files
@@ -164,24 +157,30 @@ TOOL USAGE:
    - ask_user: Ask user for confirmation and information if needed
 
 3. Implementation Tools:
-   - execute_shell: Run shell commands
+   - execute_shell: Run shell commands, some changes can use sed/awk/etc. to modify the code
    - execute_code_modification: Apply small changes (≤20 lines)
    - file_operation: Read, write, or append to files
-   
 
 IMPORTANT:
 1. If you can start executing the task, please start directly without asking the user if you can begin.
+2. NEVER assume code structure or implementation - always examine the actual code first.
+3. Base all suggestions and modifications on the current implementation, not assumptions.
+4. If code implementation is unclear, use available tools to investigate before proceeding.
+5. Before you start modifying the code, you should ask the user for confirmation of the modification plan.
+6. For some small changes, you can modify the code using the execute_shell tool directly or use file_operation tool to read the file and modify it.
 """
 
 def main():
     """Jarvis main entry point"""
     # Add argument parser
-    load_env_from_file()
+    init_env()
 
 
     try:
+        tool_registry = ToolRegistry()
+        tool_registry.dont_use_tools(["create_sub_agent"])
         # Get global model instance
-        agent = Agent(system_prompt=system_prompt, name="Jarvis Code Agent")
+        agent = Agent(system_prompt=system_prompt, name="Jarvis Code Agent", tool_registry=tool_registry)
 
         # Interactive mode
         while True:

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/src/jarvis/jarvis_codebase/main.py

@@ -10,7 +10,7 @@ import concurrent.futures
 from threading import Lock
 from concurrent.futures import ThreadPoolExecutor
 from jarvis.utils import OutputType, PrettyOutput, find_git_root, get_file_md5, get_max_context_length, get_single_line_input, get_thread_count, load_embedding_model, load_rerank_model
-from jarvis.utils import load_env_from_file
+from jarvis.utils import init_env
 import argparse
 import pickle
 import lzma  # 添加 lzma 导入
@@ -19,7 +19,7 @@ import re
 
 class CodeBase:
     def __init__(self, root_dir: str):
-        load_env_from_file()
+        init_env()
         self.root_dir = root_dir
         os.chdir(self.root_dir)
         self.thread_count = get_thread_count()
@@ -27,7 +27,7 @@ class CodeBase:
         self.index = None
             
         # 初始化数据目录
-        self.data_dir = os.path.join(self.root_dir, ".jarvis-codebase")
+        self.data_dir = os.path.join(self.root_dir, ".jarvis/codebase")
         self.cache_dir = os.path.join(self.data_dir, "cache")
         if not os.path.exists(self.cache_dir):
             os.makedirs(self.cache_dir)

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/src/jarvis/jarvis_coder/git_utils.py

@@ -79,7 +79,7 @@ def init_git_repo(root_dir: str) -> str:
     # 3. Process .gitignore file
     gitignore_path = os.path.join(git_dir, ".gitignore")
     gitignore_modified = False
-    jarvis_ignore_pattern = ".jarvis-*"
+    jarvis_ignore_pattern = ".jarvis"
 
     # 3.1 If .gitignore does not exist, create it
     if not os.path.exists(gitignore_path):
@@ -88,13 +88,13 @@ def init_git_repo(root_dir: str) -> str:
             f.write(f"{jarvis_ignore_pattern}\n")
         gitignore_modified = True
     else:
-        # 3.2 Check if it already contains the .jarvis-* pattern
+        # 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
+        # 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)
+            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"):

{jarvis_ai_assistant-0.1.99 → jarvis_ai_assistant-0.1.101}/src/jarvis/jarvis_coder/main.py

@@ -4,7 +4,7 @@ from typing import Dict, Any, List, Optional
 import re
 
 from jarvis.jarvis_coder.file_select import select_files
-from jarvis.utils import OutputType, PrettyOutput, find_git_root, get_max_context_length, is_long_context, load_env_from_file, while_success
+from jarvis.utils import OutputType, PrettyOutput, find_git_root, get_max_context_length, is_long_context, init_env, while_success
 from jarvis.models.registry import PlatformRegistry
 from jarvis.jarvis_codebase.main import CodeBase
 from prompt_toolkit import PromptSession
@@ -88,14 +88,13 @@ class JarvisCoder:
                 "success": False,
                 "stdout": "",
                 "stderr": f"Execution failed: {str(e)}, please modify the requirement and try again",
-                "error": e
             }
 
 def main():
     """Command line entry"""
     import argparse
 
-    load_env_from_file()
+    init_env()
     
     parser = argparse.ArgumentParser(description='Code modification tool')
     parser.add_argument('-d', '--dir', help='Project root directory', default=os.getcwd())
@@ -122,11 +121,6 @@ def main():
             else:
                 if result.get("stderr"):
                     PrettyOutput.print(result["stderr"], OutputType.WARNING)
-                if result.get("error"):  # Use get() method to avoid KeyError
-                    error = result["error"]
-                    PrettyOutput.print(f"Error type: {type(error).__name__}", OutputType.WARNING)
-                    PrettyOutput.print(f"Error information: {str(error)}", OutputType.WARNING)
-                # Prompt user to continue input
                 PrettyOutput.print("\nYou can modify the requirements and try again", OutputType.INFO)
                 
         except KeyboardInterrupt: