jarvis-ai-assistant 0.1.100__tar.gz → 0.1.102__tar.gz

{jarvis_ai_assistant-0.1.100/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.100
+Version: 0.1.102
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -46,14 +46,8 @@ Requires-Dist: prompt_toolkit>=3.0.0
 Requires-Dist: openai>=1.20.0
 Requires-Dist: playwright>=1.41.1
 Requires-Dist: numpy>=1.24.0
-Requires-Dist: faiss-cpu>=1.8.0
-Requires-Dist: sentence-transformers>=2.2.2
 Requires-Dist: bs4>=0.0.1
-Requires-Dist: PyMuPDF>=1.21.0
-Requires-Dist: python-docx>=0.8.11
-Requires-Dist: tiktoken>=0.3.0
 Requires-Dist: tqdm>=4.65.0
-Requires-Dist: docx>=0.2.4
 Requires-Dist: yaspin>=2.5.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
@@ -154,27 +148,6 @@ Jarvis supports configuration through environment variables that can be set in t
 jarvis
 ```
 
-### Codebase Search
-```bash
-# Generate codebase index
-jarvis-codebase --generate
-
-# Search similar code
-jarvis-codebase --search "your search query"
-
-# Ask questions about codebase
-jarvis-codebase --ask "your question"
-```
-
-### Document Analysis (RAG)
-```bash
-# Build document index
-jarvis-rag --dir /path/to/documents --build
-
-# Search documents
-jarvis-rag --query "your search query"
-```
-
 ### Search Tool
 ```bash
 # Basic search
@@ -189,19 +162,6 @@ jarvis-search "your query" --max 3
 
 ## 🛠️ Tools
 
-
-### Built-in Tools
-
-| Tool | Description |
-|------|-------------|
-| execute_shell | Execute system commands and capture output |
-| file_operation | File operations (read/write/append/delete) |
-| generate_tool | AI-powered tool generation and integration |
-| methodology | Experience accumulation and methodology management |
-| create_sub_agent | Create specialized sub-agents for specific tasks |
-| coder | Automatic code modification and generation tool |
-| codebase | Codebase management and search tool |
-
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
 - User tools: `~/.jarvis/tools/`
@@ -214,27 +174,21 @@ jarvis-search "your query" --max 3
 - Automatic code generation and integration
 - Dynamic capability expansion through sub-agents
 - Automatic code modification with version control
-- Codebase indexing and semantic search
 
 #### 2. Methodology Learning
 - Automatic experience accumulation from interactions
 - Pattern recognition and methodology extraction
 - Continuous refinement through usage
 - Code modification history tracking
-- Codebase analysis and documentation generation
 
 #### 3. Adaptive Problem Solving
 - Context-aware sub-agent creation
 - Dynamic tool composition
 - Learning from execution feedback
-- Codebase-aware problem solving
 - Multi-model collaboration for complex tasks
 
 #### 4. Code Intelligence
-- Automatic codebase indexing
-- Semantic code search
 - Code modification with git integration
-- Code analysis and documentation
 - Multi-model code generation
 
 ## 🎯 Extending Jarvis

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/README.md

@@ -88,27 +88,6 @@ Jarvis supports configuration through environment variables that can be set in t
 jarvis
 ```
 
-### Codebase Search
-```bash
-# Generate codebase index
-jarvis-codebase --generate
-
-# Search similar code
-jarvis-codebase --search "your search query"
-
-# Ask questions about codebase
-jarvis-codebase --ask "your question"
-```
-
-### Document Analysis (RAG)
-```bash
-# Build document index
-jarvis-rag --dir /path/to/documents --build
-
-# Search documents
-jarvis-rag --query "your search query"
-```
-
 ### Search Tool
 ```bash
 # Basic search
@@ -123,19 +102,6 @@ jarvis-search "your query" --max 3
 
 ## 🛠️ Tools
 
-
-### Built-in Tools
-
-| Tool | Description |
-|------|-------------|
-| execute_shell | Execute system commands and capture output |
-| file_operation | File operations (read/write/append/delete) |
-| generate_tool | AI-powered tool generation and integration |
-| methodology | Experience accumulation and methodology management |
-| create_sub_agent | Create specialized sub-agents for specific tasks |
-| coder | Automatic code modification and generation tool |
-| codebase | Codebase management and search tool |
-
 ### Tool Locations
 - Built-in tools: `src/jarvis/tools/`
 - User tools: `~/.jarvis/tools/`
@@ -148,27 +114,21 @@ jarvis-search "your query" --max 3
 - Automatic code generation and integration
 - Dynamic capability expansion through sub-agents
 - Automatic code modification with version control
-- Codebase indexing and semantic search
 
 #### 2. Methodology Learning
 - Automatic experience accumulation from interactions
 - Pattern recognition and methodology extraction
 - Continuous refinement through usage
 - Code modification history tracking
-- Codebase analysis and documentation generation
 
 #### 3. Adaptive Problem Solving
 - Context-aware sub-agent creation
 - Dynamic tool composition
 - Learning from execution feedback
-- Codebase-aware problem solving
 - Multi-model collaboration for complex tasks
 
 #### 4. Code Intelligence
-- Automatic codebase indexing
-- Semantic code search
 - Code modification with git integration
-- Code analysis and documentation
 - Multi-model code generation
 
 ## 🎯 Extending Jarvis

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.100"
+version = "0.1.102"
 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" }]
@@ -28,14 +28,8 @@ dependencies = [
     "openai>=1.20.0",
     "playwright>=1.41.1",
     "numpy>=1.24.0",
-    "faiss-cpu>=1.8.0",
-    "sentence-transformers>=2.2.2",
     "bs4>=0.0.1",
-    "PyMuPDF>=1.21.0",
-    "python-docx>=0.8.11",
-    "tiktoken>=0.3.0",
     "tqdm>=4.65.0",
-    "docx>=0.2.4",
     "yaspin>=2.5.0",
 ]
 requires-python = ">=3.8"
@@ -49,9 +43,6 @@ Homepage = "https://github.com/skyfireitdiy/Jarvis"
 [project.scripts]
 jarvis = "jarvis.agent:main"
 jarvis-code-agent = "jarvis.jarvis_code_agent.main:main"
-jarvis-coder = "jarvis.jarvis_coder.main:main"
-jarvis-codebase = "jarvis.jarvis_codebase.main:main"
-jarvis-rag = "jarvis.jarvis_rag.main:main"
 jarvis-smart-shell = "jarvis.jarvis_smart_shell.main:main"
 jss = "jarvis.jarvis_smart_shell.main:main"
 jarvis-platform = "jarvis.jarvis_platform.main:main"

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.100",
+    version="0.1.102",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -20,23 +20,14 @@ setup(
         "openai>=1.20.0",
         "playwright>=1.41.1",
         "numpy>=1.24.0",
-        "faiss-cpu>=1.8.0",
-        "sentence-transformers>=2.2.2",
         "bs4>=0.0.1",
-        "PyMuPDF>=1.21.0",
-        "python-docx>=0.8.11",
-        "tiktoken>=0.3.0",
         "tqdm>=4.65.0",
-        "docx>=0.2.4",
         "yaspin>=2.5.0",
     ],
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.agent:main",
             "jarvis-code-agent=jarvis.jarvis_code_agent.main:main",
-            "jarvis-coder=jarvis.jarvis_coder.main:main",
-            "jarvis-codebase=jarvis.jarvis_codebase.main:main",
-            "jarvis-rag=jarvis.jarvis_rag.main:main",
             "jarvis-smart-shell=jarvis.jarvis_smart_shell.main:main",
             "jss=jarvis.jarvis_smart_shell.main:main",
             "jarvis-platform=jarvis.jarvis_platform.main:main",

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.100" 
+__version__ = "0.1.102" 

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/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, init_env
+from jarvis.utils import PrettyOutput, OutputType, get_single_line_input, load_methodology, add_agent, delete_current_agent, get_max_context_length, get_multiline_input, init_env
 import os
 
 class Agent:
@@ -35,29 +35,9 @@ class Agent:
         self.conversation_length = 0  # Use length counter instead
         self.system_prompt = system_prompt
         # Load configuration from environment variables
-        self.embedding_dimension = 1536  # Default for many embedding models
+        
         self.max_context_length = get_max_context_length()
         
-        # Initialize embedding model
-        try:
-            self.embedding_model = load_embedding_model()
-            
-            # Warm up model and get correct dimension
-            test_text = "This is a test text to ensure the model is fully loaded."
-            test_embedding = self.embedding_model.encode(
-                test_text, 
-                convert_to_tensor=True,
-                normalize_embeddings=True
-            )
-            self.embedding_dimension = len(test_embedding)
-            PrettyOutput.print("Successfully loaded embedding model", OutputType.SUCCESS)
-            
-            # Initialize HNSW index (use correct dimension)
-            
-            
-        except Exception as e:
-            PrettyOutput.print(f"Failed to load embedding model: {str(e)}", OutputType.ERROR)
-            raise
             
         # Initialize methodology related attributes
         self.methodology_data = []
@@ -441,7 +421,6 @@ Strict Rules:
 - Don't create fake dialogues
 - If current information is insufficient, you may ask the user
 - Not all problem-solving steps are mandatory, skip as appropriate
-- Ask user before executing tools that might damage system or user's codebase
 - Request user guidance when multiple iterations show no progress
 - If yaml string contains colons, wrap the entire string in quotes to avoid yaml parsing errors
 - Use | syntax for multi-line strings in yaml
@@ -459,7 +438,7 @@ def main():
 
     try:
         # 获取全局模型实例
-        agent = Agent(system_prompt=origin_agent_system_prompt)
+        agent = Agent(system_prompt=origin_agent_system_prompt, tool_registry=ToolRegistry())
 
         # 加载预定义任务
         tasks = load_tasks()

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/src/jarvis/jarvis_code_agent/main.py

@@ -79,8 +79,8 @@ DEVELOPMENT WORKFLOW:
      <TOOL_CALL>
      name: create_code_sub_agent
      arguments:
+         name: code_sub_agent
          subtask: Implement new authentication flow
-         codebase_dir: .
      </TOOL_CALL>
 
 FILE SELECTION WORKFLOW:
@@ -147,10 +147,8 @@ TOOL USAGE:
    - ask_user: Ask user for confirmation and information if needed
    - create_code_sub_agent: Create agent for each small change
    - file_operation: Read files
-   - rag: Ask questions based on a document directory, supporting multiple document formats (txt, pdf, docx, etc.)
    - search: Use Bing search engine to search for information, and extract key information based on the question
    - thinker: Deep thinking and logical reasoning
-
 2. Planning Tools:
    - thinker: Generate a detailed modification plan based on user requirements and actual code conditions.
    - create_code_sub_agent: Create agent for each small change

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/src/jarvis/jarvis_coder/patch_handler.py

@@ -211,7 +211,7 @@ class PatchHandler:
                 else:
                     content = "<File does not exist, need to create>"
                     
-                prompt = """You are a senior software development expert who can generate code patches based on the complete modification plan, current original code file path, code content, and current file's modification plan. The output format should be as follows:
+                prompt = """You are a senior software development expert who can generate code patches based on the complete modification plan, current original code file path, code content (with 4-digit hexadecimal line numbers), and current file's modification plan. The output format should be as follows:
 
                 <PATCH>
                 [start,end)
@@ -220,16 +220,16 @@ class PatchHandler:
 
                 Example:
                 <PATCH>
-                [0004,0004)
+                [000c,000c)
                 def new_function():
-    pass
+                    pass
                 </PATCH>
 
                 means:
-                Insert code BEFORE line 4:
+                Insert code BEFORE line 12:
                 ```
                 def new_function():
-    pass
+                    pass
                 ```
                 
                 Example 2:

jarvis_ai_assistant-0.1.102/src/jarvis/jarvis_github/main.py

@@ -0,0 +1,232 @@
+import os
+import sys
+import argparse
+from typing import Dict, List, Optional
+import yaml
+
+from jarvis.agent import Agent
+from jarvis.utils import PrettyOutput, OutputType, get_single_line_input, init_env
+from jarvis.tools import ToolRegistry
+
+# System prompt for the GitHub workflow agent
+github_workflow_prompt = """You are a GitHub Workflow Agent that helps manage the complete development workflow using GitHub CLI (gh). Follow these steps strictly:
+
+1. Environment Check:
+   - Verify gh CLI installation
+   - Check authentication status
+   - Set up authentication if needed
+
+2. Issue Management:
+   - List and display available issues
+   - Help user select an issue to work on
+   - Analyze the selected issue thoroughly
+
+3. Development Planning:
+   - Create a development branch for the issue
+   - Generate a detailed modification plan
+   - Break down the task into smaller steps
+
+4. Implementation:
+   - Guide through the implementation process
+   - Track changes and progress
+   - Ensure code quality
+
+5. Review and Submit:
+   - Review changes before submission
+   - Create and submit pull request
+   - Handle review feedback
+   - Close the issue upon completion
+
+Always follow GitHub best practices and provide clear feedback at each step.
+"""
+
+def check_gh_installation() -> bool:
+    """Check if GitHub CLI is installed"""
+    return os.system("gh --version > /dev/null 2>&1") == 0
+
+def check_gh_auth() -> bool:
+    """Check if GitHub CLI is authenticated"""
+    return os.system("gh auth status > /dev/null 2>&1") == 0
+
+def setup_gh_auth() -> bool:
+    """Guide user through GitHub CLI authentication"""
+    PrettyOutput.print("Starting GitHub CLI authentication...", OutputType.INFO)
+    return os.system("gh auth login") == 0
+
+def list_issues() -> List[Dict]:
+    """List all available issues"""
+    try:
+        # Get issues in JSON format
+        result = os.popen("gh issue list --json number,title,body,url").read()
+        issues = yaml.safe_load(result)
+        return issues
+    except Exception as e:
+        PrettyOutput.print(f"Error listing issues: {str(e)}", OutputType.ERROR)
+        return []
+
+def select_issue(issues: List[Dict]) -> Optional[Dict]:
+    """Display issues and let user select one"""
+    if not issues:
+        PrettyOutput.print("No issues found.", OutputType.WARNING)
+        return None
+    
+    PrettyOutput.print("\nAvailable Issues:", OutputType.INFO)
+    for i, issue in enumerate(issues, 1):
+        print(f"{i}. #{issue['number']} - {issue['title']}")
+    
+    while True:
+        try:
+            choice = get_single_line_input("\nSelect an issue number (or 0 to exit): ")
+            if not choice or choice == "0":
+                return None
+            
+            index = int(choice) - 1
+            if 0 <= index < len(issues):
+                return issues[index]
+            else:
+                PrettyOutput.print("Invalid selection. Please try again.", OutputType.WARNING)
+        except ValueError:
+            PrettyOutput.print("Please enter a valid number.", OutputType.WARNING)
+
+def create_development_branch(issue_number: int) -> bool:
+    """Create a development branch for the issue"""
+    try:
+        result = os.system(f"gh issue develop {issue_number} --checkout")
+        return result == 0
+    except Exception as e:
+        PrettyOutput.print(f"Error creating branch: {str(e)}", OutputType.ERROR)
+        return False
+
+def create_pull_request(issue_number: int, title: str, body: str) -> bool:
+    """Create a pull request for the changes"""
+    try:
+        cmd = f'gh pr create --title "{title}" --body "{body}" --issue {issue_number}'
+        result = os.system(cmd)
+        return result == 0
+    except Exception as e:
+        PrettyOutput.print(f"Error creating pull request: {str(e)}", OutputType.ERROR)
+        return False
+
+def close_issue(issue_number: int) -> bool:
+    """Close the issue"""
+    try:
+        result = os.system(f"gh issue close {issue_number}")
+        return result == 0
+    except Exception as e:
+        PrettyOutput.print(f"Error closing issue: {str(e)}", OutputType.ERROR)
+        return False
+
+def install_gh_linux() -> bool:
+    """Install GitHub CLI on Linux"""
+    PrettyOutput.print("Installing GitHub CLI...", OutputType.INFO)
+    
+    # Detect package manager
+    package_managers = {
+        "apt": "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
+                echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main\" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
+                sudo apt update && sudo apt install gh -y",
+        "dnf": "sudo dnf install 'dnf-command(config-manager)' -y && \
+                sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && \
+                sudo dnf install gh -y",
+        "yum": "sudo yum install 'dnf-command(config-manager)' -y && \
+                sudo yum config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && \
+                sudo yum install gh -y",
+        "pacman": "sudo pacman -S github-cli --noconfirm",
+    }
+    
+    # Try to detect the package manager
+    for pm, cmd in package_managers.items():
+        if os.system(f"which {pm} > /dev/null 2>&1") == 0:
+            PrettyOutput.print(f"Detected {pm} package manager", OutputType.INFO)
+            if os.system(cmd) == 0:
+                PrettyOutput.print("GitHub CLI installed successfully!", OutputType.SUCCESS)
+                return True
+            else:
+                PrettyOutput.print(f"Failed to install using {pm}", OutputType.ERROR)
+                return False
+    
+    PrettyOutput.print(
+        "Could not detect supported package manager. Please install manually:\n"
+        "https://github.com/cli/cli/blob/trunk/docs/install_linux.md",
+        OutputType.ERROR
+    )
+    return False
+
+def main():
+    """Main entry point for GitHub workflow"""
+    init_env()
+    
+    # Check GitHub CLI installation
+    if not check_gh_installation():
+        if sys.platform.startswith('linux'):
+            if not install_gh_linux():
+                return 1
+        else:
+            PrettyOutput.print(
+                "GitHub CLI (gh) is not installed. Please install it first:\n"
+                "- Windows: winget install GitHub.cli\n"
+                "- macOS: brew install gh\n"
+                "- Linux: See https://github.com/cli/cli/blob/trunk/docs/install_linux.md",
+                OutputType.ERROR
+            )
+            return 1
+    
+    # Check authentication
+    if not check_gh_auth():
+        PrettyOutput.print("GitHub CLI needs authentication.", OutputType.WARNING)
+        if not setup_gh_auth():
+            PrettyOutput.print("Authentication failed. Please try again.", OutputType.ERROR)
+            return 1
+    
+    # List and select issue
+    issues = list_issues()
+    selected_issue = select_issue(issues)
+    if not selected_issue:
+        PrettyOutput.print("No issue selected. Exiting.", OutputType.INFO)
+        return 0
+    
+    # Create GitHub workflow agent
+    tool_registry = ToolRegistry()
+    agent = Agent(
+        system_prompt=github_workflow_prompt,
+        name="GitHub Workflow Agent",
+        tool_registry=tool_registry
+    )
+    
+    # Start the workflow
+    try:
+        # Create development branch
+        if not create_development_branch(selected_issue['number']):
+            return 1
+        
+        # Run the agent with the selected issue
+        workflow_request = f"""
+        Working on issue #{selected_issue['number']}: {selected_issue['title']}
+        
+        Issue description:
+        {selected_issue['body']}
+        
+        Please guide through the development process and help create a pull request.
+        """
+        
+        result = agent.run(workflow_request)
+        
+        # Create pull request and close issue if successful
+        if result and "success" in result.lower():
+            if create_pull_request(
+                selected_issue['number'],
+                f"Fix #{selected_issue['number']}: {selected_issue['title']}",
+                "Implements the requested changes and fixes the issue."
+            ):
+                close_issue(selected_issue['number'])
+                PrettyOutput.print("Workflow completed successfully!", OutputType.SUCCESS)
+                return 0
+    
+    except Exception as e:
+        PrettyOutput.print(f"Error in workflow: {str(e)}", OutputType.ERROR)
+        return 1
+    
+    return 1
+
+if __name__ == "__main__":
+    sys.exit(main())

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/src/jarvis/models/ai8.py

@@ -14,6 +14,7 @@ class AI8Model(BasePlatform):
 
     def get_model_list(self) -> List[Tuple[str, str]]:
         """获取模型列表"""
+        self.get_available_models()
         return [(name,info['desc']) for name,info in self.models.items()]
     
     def __init__(self):
@@ -30,9 +31,7 @@ class AI8Model(BasePlatform):
         
         
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
-        if self.model_name not in self.get_available_models():
-            PrettyOutput.print(f"Warning: The selected model {self.model_name} is not in the available list", OutputType.WARNING)
-        
+
 
     def set_model_name(self, model_name: str):
         """Set model name"""

{jarvis_ai_assistant-0.1.100 → jarvis_ai_assistant-0.1.102}/src/jarvis/models/oyi.py

@@ -14,6 +14,7 @@ class OyiModel(BasePlatform):
 
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""
+        self.get_available_models()
         return [(name,info['desc']) for name,info in self.models.items()]
     
     def __init__(self):
@@ -31,9 +32,6 @@ class OyiModel(BasePlatform):
             PrettyOutput.print("OYI_API_KEY is not set", OutputType.WARNING)
         
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
-        if self.model_name not in [m.split()[0] for m in self.get_available_models()]:
-            PrettyOutput.print(f"Warning: The selected model {self.model_name} is not in the available list", OutputType.WARNING)
-        
 
     def set_model_name(self, model_name: str):
         """Set model name"""