jarvis-ai-assistant 0.1.102__py3-none-any.whl → 0.1.103__py3-none-any.whl

jarvis/tools/create_code_sub_agent.py

@@ -1,56 +1,30 @@
-from typing import Dict, Any
 
-from jarvis.agent import Agent
-from jarvis.utils import OutputType, PrettyOutput
-from jarvis.jarvis_code_agent.main import system_prompt
+
+
+from typing import Any, Dict
+from jarvis.jarvis_code_agent.code_agent import CodeAgent
 
 
 class CodeSubAgentTool:
     name = "create_code_sub_agent"
-    description = "Create a sub-agent to handle specific code development subtasks"
+    description = "Create a sub-agent to handle the code modification"
     parameters = {
         "type": "object",
         "properties": {
-            "name": {
-                "type": "string",
-                "description": "The name of the sub-agent"
-            },
-            "subtask": {
+            "requirement": {
                 "type": "string",
-                "description": "The specific code development subtask to complete"
-            },
-        },
-        "required": ["subtask", "name"]
+                "description": "The requirement of the sub-agent"
+            }
+        }
     }
-
+    
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """Execute code development subtask"""
-        try:
-            subtask = args["subtask"]
-            name = args["name"]
-
-            PrettyOutput.print(f"Creating code sub-agent {name} for subtask: {subtask}", OutputType.INFO)
-
-            # Create sub-agent
-            sub_agent = Agent(
-                system_prompt=system_prompt,
-                name=name,
-                is_sub_agent=True
-            )
-
-            # Execute subtask
-            result = sub_agent.run(subtask)
-
-            return {
-                "success": True,
-                "stdout": f"Code Development Subtask Results:\n\n{result}",
-                "stderr": ""
-            }
-
-        except Exception as e:
-            PrettyOutput.print(str(e), OutputType.ERROR)
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"Failed to execute code development subtask: {str(e)}"
-            }
+        """Execute the sub-agent"""
+        requirement = args["requirement"]
+        agent = CodeAgent()
+        output = agent.run(requirement)
+        return {
+            "success": True,
+            "stdout": output,
+            "stderr": ""
+        }

jarvis/tools/create_code_test_agent.py

@@ -0,0 +1,115 @@
+from typing import Dict, Any
+from jarvis.agent import Agent
+from jarvis.tools.registry import ToolRegistry
+import subprocess
+
+class TestAgentTool:
+    name = "create_code_test_agent"
+    description = "Create testing agent for specific commit analysis"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "name": {
+                "type": "string",
+                "description": "Identifier for the test agent"
+            },
+            "test_scope": {
+                "type": "string", 
+                "enum": ["unit", "integration", "e2e"],
+                "description": "Testing focus area"
+            },
+            "commit_sha": {
+                "type": "string",
+                "description": "Commit SHA to analyze"
+            }
+        },
+        "required": ["name", "test_scope", "commit_sha"]
+    }
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute commit-focused testing"""
+        try:
+            if not self._is_valid_commit(args["commit_sha"]):
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"Invalid commit SHA: {args['commit_sha']}"
+                }
+
+            tool_registry = ToolRegistry()  
+            tool_registry.dont_use_tools(["create_code_test_agent"])
+
+            test_agent = Agent(
+                system_prompt=self._build_system_prompt(args),
+                name=f"TestAgent({args['name']})",
+                is_sub_agent=True,
+                tool_registry=tool_registry
+            )
+
+            result = test_agent.run(
+                f"Analyze and test changes in commit {args['commit_sha'].strip()}"
+            )
+
+            return {
+                "success": True,
+                "stdout": result,
+                "stderr": ""
+            }
+        except Exception as e:
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"Commit testing failed: {str(e)}"
+            }
+
+    def _is_valid_commit(self, commit_sha: str) -> bool:
+        """Validate commit exists in repository"""
+        try:
+            cmd = f"git cat-file -t {commit_sha}"
+            result = subprocess.run(
+                cmd.split(), 
+                capture_output=True, 
+                text=True,
+                check=True
+            )
+            return "commit" in result.stdout
+        except subprocess.CalledProcessError:
+            return False
+
+    def _build_system_prompt(self, args: Dict) -> str:
+        return """You are a Commit Testing Specialist. Follow this protocol:
+
+【Testing Protocol】
+1. Commit Analysis:
+   - Analyze code changes in target commit
+   - Identify modified components
+   - Assess change impact scope
+
+2. Test Strategy:
+   - Determine required test types
+   - Verify backward compatibility
+   - Check interface contracts
+
+3. Test Execution:
+   - Execute relevant test suites
+   - Compare pre/post-commit behavior
+   - Validate cross-component interactions
+
+4. Reporting:
+   - List affected modules
+   - Risk assessment matrix
+   - Performance impact analysis
+   - Security implications
+
+【Output Requirements】
+- Test coverage analysis
+- Behavioral change summary
+- Critical issues prioritized
+- Actionable recommendations
+
+【Key Principles】
+1. Focus on delta changes
+2. Maintain test isolation
+3. Preserve historical baselines
+4. Automate verification steps
+5. Document test evidence"""

jarvis/tools/create_ctags_agent.py

@@ -0,0 +1,176 @@
+from typing import Dict, Any
+import subprocess
+import os
+from pathlib import Path
+
+import yaml
+from jarvis.agent import Agent
+from jarvis.tools.registry import ToolRegistry
+from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, init_env
+
+ctags_system_prompt = """You are a Ctags Expert Agent specializing in code analysis using Exuberant Ctags. Follow this protocol:
+
+【OUTPUT OPTIMIZATION】
+1. Filter with grep:
+   ctags -x <symbol> | grep -E 'pattern'
+2. Limit output lines:
+   head -n 20
+3. Context preview:
+   grep -A 3 -B 3 <line> <file>
+4. Column selection:
+   cut -f 1,3
+5. Sort and deduplicate:
+   sort | uniq
+
+【WORKFLOW】
+1. REQUIREMENT ANALYSIS
+   - Analyze query for symbols/patterns
+   - Determine search scope
+   - Select ctags options
+   - Plan output filtering
+
+2. TAGS MANAGEMENT
+   - Generate/update tags file:
+     ctags -R --languages=<lang> --exclude=<pattern>
+   - Verify tags file integrity
+   - Maintain tags file versioning
+
+3. SYMBOL PROCESSING
+   - Search symbols using:
+     grep -n <symbol> tags
+     ctags -x --<filter>
+   - Analyze symbol relationships
+   - Map symbol dependencies
+   - Apply output filters:
+     * Remove noise with grep -v
+     * Highlight key fields with awk
+     * Truncate long lines with cut
+
+4. OUTPUT GENERATION
+   - Format results as YAML
+   - Include file paths and line numbers
+   - Add symbol metadata
+   - Limit to 20 key results
+   - Exclude temporary files
+   - Compress repetitive info
+
+【COMMAND REFERENCE】
+1. Generate Tags:
+   ctags -R --fields=+nKSt --extras=+fq -V * 
+
+2. Search Patterns:
+   ctags -x --c-types=f 
+   ctags -x --sort=no <symbol>
+   ctags -x | grep '^main' | head -n 5
+
+3. Language Specific:
+   --languages=Python,Java,C++
+   --python-kinds=-iv
+
+4. Filtering:
+   --exclude=.git
+   --exclude=*.min.js
+   ctags -x | grep -v '_test'  # Exclude tests
+
+【ERROR HANDLING】
+- Missing tags: Regenerate tags
+- Invalid symbols: Use fuzzy search
+- Encoding issues: Use --input-encoding
+- Large codebase: Limit scope
+- Output too long: Add head/grep filters
+
+【NATURAL LANGUAGE PROCESSING】
+1. Query Interpretation:
+   - Identify key terms: "find", "locate", "list", "show"
+   - Detect symbol types: class, function, variable
+   - Recognize relationships: "calls", "inherits", "uses"
+
+2. Query Types:
+   - Location: "Where is X defined?"
+   - References: "Who calls Y?"
+   - Hierarchy: "Show subclasses of Z"
+   - Impact: "What uses this module?"
+
+3. Auto Command Mapping:
+   | Query Pattern                | Ctags Command                      |
+   |------------------------------|------------------------------------|
+   | Find definitions of X         | ctags -x --<lang>-kinds=f | less   |
+   | List all functions in Y       | ctags -x --filter='function'       |
+   | Show callers of Z             | ctags --extra=+q -x | grep Z       |
+   | Find interface implementations| ctags -x --_traits=yes             |
+
+4. Context Handling:
+   - Detect language from file extensions
+   - Auto-detect project root
+   - Apply language-specific filters
+   - Choose appropriate output format:
+      * Simple list for single results
+      * Table for multiple entries
+      * Tree view for hierarchies
+      * JSON when programmatic access needed
+
+【EXAMPLE QUERIES】
+1. "Find all Python functions in src/ that use Redis"
+2. "Show Java classes implementing PaymentService"
+3. "List called methods in auth module"
+4. "Where is User model defined?"
+5. "What config files reference database settings?"
+"""
+
+class CtagsTool:
+    name = "create_ctags_agent"
+    description = "Analyze code structure and symbols using natural language queries"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "query": {
+                "type": "string",
+                "description": "Natural language description of code analysis needs"
+            }
+        },
+        "required": ["query"]
+    }
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute code analysis based on natural language query"""
+        try:
+            tool_registry = ToolRegistry()
+            tool_registry.use_tools(["execute_shell"])
+
+            ctags_agent = Agent(
+                system_prompt=ctags_system_prompt,
+                name="Ctags Analysis Agent",
+                is_sub_agent=True,
+                tool_registry=tool_registry
+            )
+
+            analysis_request = f"""
+            Analysis Request: {args['query']}
+            Context: {args.get('context', {})}
+            """
+
+            result = ctags_agent.run(analysis_request)
+
+            return {
+                "success": True,
+                "stdout": result,
+                "stderr": ""
+            }
+        except Exception as e:
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"Analysis failed: {str(e)}"
+            }
+
+def main():
+    """CLI testing"""
+    init_env()
+    tool = CtagsTool()
+    query = get_multiline_input("Please enter your query:")
+    result = tool.execute({
+        "query": query
+    })
+    PrettyOutput.print(yaml.dump(result, default_style='|'), OutputType.INFO)
+if __name__ == "__main__":
+    main()

jarvis/tools/create_sub_agent.py

@@ -2,6 +2,7 @@ from typing import Dict, Any
 
 
 from jarvis.agent import Agent, origin_agent_system_prompt
+from jarvis.tools.registry import ToolRegistry
 from jarvis.utils import OutputType, PrettyOutput
 
 
@@ -58,12 +59,11 @@ class SubAgentTool:
             if goal:
                 task_description += f"\n\nCompletion goal:\n{goal}"
 
-            
 
             # Create sub-agent
             sub_agent = Agent(
                 system_prompt=origin_agent_system_prompt,
-                name=agent_name,
+                name=f"Agent({agent_name})",
                 is_sub_agent=True
             )
 

jarvis/tools/execute_shell.py

@@ -29,7 +29,7 @@ class ShellTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute shell command"""
         try:
-            command = args["command"]
+            command = args["command"].strip()
             
             # Generate temporary file name
             output_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.log")
@@ -61,7 +61,7 @@ class ShellTool:
                 Path(output_file).unlink(missing_ok=True)
             
             return {
-                "success": return_code == 0,
+                "success": True,
                 "stdout": output,
                 "stderr": "",
             }

jarvis/tools/file_operation.py

@@ -37,8 +37,8 @@ class FileOperationTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute file operations"""
         try:
-            operation = args["operation"]
-            filepath = args["filepath"]
+            operation = args["operation"].strip()
+            filepath = args["filepath"].strip()
             encoding = args.get("encoding", "utf-8")
             
             # Record the operation and the full path

jarvis/tools/find_in_codebase.py

@@ -0,0 +1,108 @@
+from typing import Dict, Any
+from jarvis.jarvis_code_agent.file_select import select_files
+from jarvis.utils import OutputType, PrettyOutput, dont_use_local_model, find_git_root
+from jarvis.jarvis_codebase.main import CodeBase
+
+class FindInCodebaseTool:
+    """Tool for searching files in codebase based on requirements"""
+    
+    name = "find_in_codebase"
+    description = "Search and identify relevant code files in the codebase based on requirements description, using semantic search"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "query": {
+                "type": "string",
+                "description": "The search query or requirement description"
+            },
+            "top_k": {
+                "type": "integer",
+                "description": "Maximum number of results to return",
+                "default": 20
+            }
+        },
+        "required": ["query"]
+    }
+
+    @staticmethod
+    def check() -> bool:
+        return not dont_use_local_model()
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute the search
+        
+        Args:
+            args: Dictionary containing:
+                - query: Search query string
+                - top_k: Maximum number of results (optional)
+                
+        Returns:
+            Dict containing:
+                - success: Boolean indicating success
+                - stdout: Search results in YAML format
+                - stderr: Error message if any
+        """
+        try:
+            query = args["query"]
+            top_k = args.get("top_k", 20)
+
+            root_dir = find_git_root()
+
+            codebase = CodeBase(root_dir)
+
+            # Search for relevant files
+            results = codebase.search_similar(query, top_k)
+
+            results = select_files(results, root_dir)
+
+            if not results:
+                return {
+                    "success": True,
+                    "stdout": "files: []\n",
+                    "stderr": "No relevant files found"
+                }
+
+
+            return {
+                "success": True,
+                "stdout": "\n".join(results),
+                "stderr": ""
+            }
+
+        except Exception as e:
+            PrettyOutput.print(f"Search error: {str(e)}", OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"Failed to execute search: {str(e)}"
+            }
+
+def main():
+    """Command line interface for the tool"""
+    import argparse
+    
+    parser = argparse.ArgumentParser(description='Search for relevant files in codebase')
+    parser.add_argument('query', help='Search query or requirement description')
+    parser.add_argument('--top-k', type=int, default=20, help='Maximum number of results to return')
+    
+    args = parser.parse_args()
+    
+    tool = FindInCodebaseTool()
+    result = tool.execute({
+        "query": args.query,
+        "top_k": args.top_k
+    })
+    
+    if result["success"]:
+        if result["stdout"]:
+            print(result["stdout"])
+        else:
+            PrettyOutput.print("No relevant files found", OutputType.WARNING)
+    else:
+        PrettyOutput.print(result["stderr"], OutputType.ERROR)
+        return 1
+        
+    return 0
+
+if __name__ == "__main__":
+    exit(main())

jarvis/tools/git_commiter.py

@@ -0,0 +1,68 @@
+import os
+import re
+from typing import Dict, Any
+
+import yaml
+from jarvis.agent import Agent
+from jarvis.models.registry import PlatformRegistry
+from jarvis.tools.registry import ToolRegistry
+from jarvis.utils import OutputType, PrettyOutput, init_env
+import sys
+
+
+class GitCommitTool:
+    name = "git_commit_agent"
+    description = "Automatically generate and execute git commits based on code changes"
+    parameters = {"properties": {}, "required": []}
+
+    def _extract_commit_message(self, message):
+        r = re.search(r"<COMMIT_MESSAGE>(.*)</COMMIT_MESSAGE>", message, re.DOTALL)
+        if r:
+            return ';'.join(r.group(1).strip().splitlines())
+        return "Unknown commit message"
+    
+    def _get_last_commit_hash(self):
+        return os.popen("git log -1 --pretty=%H").read().strip()
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """Execute automatic commit process"""
+        try:
+            PrettyOutput.print("Add files to commit...", OutputType.SYSTEM)
+            os.system("git add .")
+            PrettyOutput.print("Get diff...", OutputType.SYSTEM)
+            diff = os.popen("git diff --cached --exit-code").read()
+            PrettyOutput.print(diff, OutputType.CODE)
+            prompt = f'''Please generate a commit message for the following changes.
+            Format:
+            <COMMIT_MESSAGE>
+            type(scope): description
+            </COMMIT_MESSAGE>
+            
+            Don't include any other information.
+
+            {diff}
+            '''
+            PrettyOutput.print("Generate commit message...", OutputType.SYSTEM)
+            platform = PlatformRegistry().get_codegen_platform()
+            platform.set_suppress_output(True)
+            commit_message = platform.chat_until_success(prompt)
+            commit_message = self._extract_commit_message(commit_message)
+            PrettyOutput.print("Commit...", OutputType.INFO)
+            os.popen(f"git commit -m '{commit_message}'")
+
+            commit_hash = self._get_last_commit_hash()
+
+            PrettyOutput.section(f"Commit hash: {commit_hash}\nCommit message: {commit_message}", OutputType.SUCCESS)
+
+            return {"success": True, "stdout": yaml.safe_dump({"commit_hash": commit_hash, "commit_message": commit_message}), "stderr": ""}
+
+        except Exception as e:
+            return {"success": False, "stdout": "", "stderr": f"Commit error: {str(e)}"}
+
+def main():
+    init_env()
+    tool = GitCommitTool()
+    tool.execute({})
+
+if __name__ == "__main__":
+    sys.exit(main())

jarvis/tools/methodology.py

@@ -73,9 +73,9 @@ class MethodologyTool:
         Returns:
             Dict[str, Any]: A dictionary containing the execution result
         """
-        operation = args.get("operation")
-        problem_type = args.get("problem_type")
-        content = args.get("content")
+        operation = args.get("operation", "").strip()
+        problem_type = args.get("problem_type", "").strip()
+        content = args.get("content", "").strip()
         
         if not operation or not problem_type:
             return {