jarvis-ai-assistant 0.1.134__py3-none-any.whl → 0.1.138__py3-none-any.whl

jarvis/jarvis_tools/execute_shell.py

@@ -1,5 +1,5 @@
 # Shell command execution module
-# 
+#
 # Provides functionality to execute shell commands safely with:
 # - Command escaping
 # - Output capturing
@@ -12,7 +12,7 @@ from pathlib import Path
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 class ShellTool:
     """Shell command execution tool
-    
+
     Attributes:
         name: Tool identifier used in API
         description: Tool description for API documentation
@@ -32,10 +32,10 @@ class ShellTool:
     }
     def _escape_command(self, cmd: str) -> str:
         """Escape special characters in command to prevent shell injection
-        
+
         Args:
             cmd: Raw command string
-            
+
         Returns:
             Escaped command string with single quotes properly handled
         """
@@ -44,21 +44,21 @@ class ShellTool:
         try:
             # Get and clean command input
             command = args["command"].strip()
-            
+
             # Generate temporary file name using process ID for uniqueness
             script_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.sh")
             output_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.log")
-            
+
             # Write command to script file
             with open(script_file, 'w', encoding='utf-8') as f:
                 f.write(f"#!/bin/bash\n{command}")
-            
+
             # Use script command to capture both stdout and stderr
             tee_command = f"script -q -c 'bash {script_file}' {output_file}"
-            
+
             # Execute command and capture return code
             os.system(tee_command)
-            
+
             # Read and process output file
             try:
                 with open(output_file, 'r', encoding='utf-8', errors='ignore') as f:
@@ -74,14 +74,14 @@ class ShellTool:
                 # Clean up temporary files
                 Path(script_file).unlink(missing_ok=True)
                 Path(output_file).unlink(missing_ok=True)
-            
+
             # Return successful result
             return {
                 "success": True,
                 "stdout": output,
                 "stderr": "",
             }
-                
+
         except Exception as e:
             # Ensure temporary files are cleaned up even if error occurs
             if 'script_file' in locals():

jarvis/jarvis_tools/execute_shell_script.py

@@ -29,7 +29,7 @@ class ShellScriptTool:
                     "stdout": "",
                     "stderr": "Missing or empty script_content parameter"
                 }
-            
+
             # Create temporary script file
             script_path = os.path.join(tempfile.gettempdir(), f"jarvis_shell_script_{os.getpid()}.sh")
             try:
@@ -39,7 +39,7 @@ class ShellScriptTool:
                 from jarvis.jarvis_tools.execute_shell import ShellTool
                 shell_tool = ShellTool()
                 result = shell_tool.execute({"command": f"bash {script_path}"})
-                
+
                 return {
                     "success": result["success"],
                     "stdout": result["stdout"],
@@ -48,7 +48,7 @@ class ShellScriptTool:
             finally:
                 # Clean up temporary script file
                 Path(script_path).unlink(missing_ok=True)
-                
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {

jarvis/jarvis_tools/file_analyzer.py

@@ -12,7 +12,7 @@ class FileAnalyzerTool:
     单文件分析工具
     使用agent深入分析单个文件的结构、实现细节和代码质量
     """
-    
+
     name = "file_analyzer"
     description = "深入分析单个文件的结构、实现细节和代码质量"
     parameters = {
@@ -35,26 +35,26 @@ class FileAnalyzerTool:
         },
         "required": ["file_path"]
     }
-    
+
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """
         执行单文件分析工具
-        
+
         Args:
             args: 包含参数的字典
-            
+
         Returns:
             包含执行结果的字典
         """
         # 存储原始目录
         original_dir = os.getcwd()
-        
+
         try:
             # 解析参数
             file_path = args.get("file_path", "")
             root_dir = args.get("root_dir", ".")
             objective = args.get("objective", "")
-            
+
             # 验证参数
             if not file_path:
                 return {
@@ -62,31 +62,31 @@ class FileAnalyzerTool:
                     "stdout": "",
                     "stderr": "必须提供文件路径"
                 }
-            
+
             # 确保文件路径是相对于root_dir的，如果是绝对路径则转换为相对路径
             abs_file_path = os.path.abspath(file_path)
             abs_root_dir = os.path.abspath(root_dir)
-            
+
             if abs_file_path.startswith(abs_root_dir):
                 rel_file_path = os.path.relpath(abs_file_path, abs_root_dir)
             else:
                 rel_file_path = file_path
-            
+
             # 获取文件扩展名和文件名
             file_ext = pathlib.Path(file_path).suffix
             file_name = os.path.basename(file_path)
-            
+
             # 创建agent的system prompt
             system_prompt = self._create_system_prompt(
                 rel_file_path, file_name, file_ext, root_dir, objective
             )
-            
+
             # 创建agent的summary prompt
             summary_prompt = self._create_summary_prompt(rel_file_path, file_name)
-            
+
             # 切换到根目录
             os.chdir(root_dir)
-            
+
             # 检查文件是否存在
             if not os.path.isfile(rel_file_path):
                 return {
@@ -94,18 +94,18 @@ class FileAnalyzerTool:
                     "stdout": "",
                     "stderr": f"文件不存在: {rel_file_path}"
                 }
-            
+
             # 构建使用的工具
             from jarvis.jarvis_tools.registry import ToolRegistry
             tool_registry = ToolRegistry()
             tool_registry.use_tools([
-                "execute_shell", 
-                "read_code", 
+                "execute_shell",
+                "read_code",
                 "find_symbol",
-                "function_analyzer", 
+                "function_analyzer",
                 "find_caller"
             ])
-            
+
             # 创建并运行agent
             analyzer_agent = Agent(
                 system_prompt=system_prompt,
@@ -117,17 +117,17 @@ class FileAnalyzerTool:
                 execute_tool_confirm=False,
                 auto_complete=True
             )
-            
+
             # 运行agent并获取结果
             task_input = f"深入分析文件 {rel_file_path} 的结构、实现细节和代码质量"
             result = analyzer_agent.run(task_input)
-            
+
             return {
                 "success": True,
                 "stdout": result,
                 "stderr": ""
             }
-                
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {
@@ -138,24 +138,24 @@ class FileAnalyzerTool:
         finally:
             # 恢复原始目录
             os.chdir(original_dir)
-    
+
     def _create_system_prompt(self, file_path: str, file_name: str, file_ext: str,
                              root_dir: str, objective: str) -> str:
         """
         创建Agent的system prompt
-        
+
         Args:
             file_path: 文件路径
             file_name: 文件名
             file_ext: 文件扩展名
             root_dir: 代码库根目录
             objective: 分析目标
-            
+
         Returns:
             系统提示文本
         """
         objective_text = f"\n\n## 分析目标\n{objective}" if objective else ""
-        
+
         return f"""# 文件分析专家
 
 ## 任务描述
@@ -164,7 +164,7 @@ class FileAnalyzerTool:
 ## 工具使用优先级
 1. **优先使用 read_code**: 直接读取文件内容是分析文件的首选方式
 2. **优先使用 execute_shell**:
-   - 使用 rg 搜索文件内容: `rg "pattern" {file_path}` 
+   - 使用 rg 搜索文件内容: `rg "pattern" {file_path}`
    - 使用 loc 统计代码: `loc {file_path}`
 3. **仅在必要时使用其他分析工具**
 
@@ -259,11 +259,11 @@ class FileAnalyzerTool:
     def _create_summary_prompt(self, file_path: str, file_name: str) -> str:
         """
         创建Agent的summary prompt
-        
+
         Args:
             file_path: 文件路径
             file_name: 文件名
-            
+
         Returns:
             总结提示文本
         """
@@ -279,4 +279,4 @@ class FileAnalyzerTool:
 - 使用具体的代码片段和实例支持你的观点
 - 以清晰的Markdown格式呈现，简洁明了
 
-在分析中保持灵活性，避免固定思维模式。你的任务不是提供全面的文件概览，而是直接解决分析目标中提出的具体问题。""" 
+在分析中保持灵活性，避免固定思维模式。你的任务不是提供全面的文件概览，而是直接解决分析目标中提出的具体问题。"""

jarvis/jarvis_tools/file_operation.py

@@ -3,6 +3,7 @@ import os
 
 from yaspin import yaspin
 
+from jarvis.jarvis_utils.globals import add_read_file_record
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -34,11 +35,12 @@ class FileOperationTool:
         "required": ["operation", "files"]
     }
 
-    def _handle_single_file(self, operation: str, filepath: str, content: str = "", 
+    def _handle_single_file(self, operation: str, filepath: str, content: str = "",
                           start_line: int = 1, end_line: int = -1) -> Dict[str, Any]:
         """Handle operations for a single file"""
         try:
             abs_path = os.path.abspath(filepath)
+            add_read_file_record(abs_path)
             if operation == "read":
                 with yaspin(text=f"正在读取文件: {abs_path}...", color="cyan") as spinner:
                     if not os.path.exists(abs_path):
@@ -47,18 +49,18 @@ class FileOperationTool:
                             "stdout": "",
                             "stderr": f"文件不存在: {abs_path}"
                         }
-                        
+
                     if os.path.getsize(abs_path) > 10 * 1024 * 1024:  # 10MB
                         return {
                             "success": False,
                             "stdout": "",
                             "stderr": "File too large (>10MB)"
                         }
-                        
+
                     with open(abs_path, 'r', encoding='utf-8', errors="ignore") as f:
                         lines = f.readlines()
-                    
-                    
+
+
                     total_lines = len(lines)
                     start_line = start_line if start_line >= 0 else total_lines + start_line + 1
                     end_line = end_line if end_line >= 0 else total_lines + end_line + 1
@@ -66,7 +68,7 @@ class FileOperationTool:
                     end_line = max(1, min(end_line, total_lines))
                     if end_line == -1:
                         end_line = total_lines
-                    
+
                     if start_line > end_line:
                         spinner.text = "无效的行范围"
                         spinner.fail("❌")
@@ -76,10 +78,10 @@ class FileOperationTool:
                             "stdout": "",
                             "stderr": error_msg
                         }
-                    
+
                     content = "".join(lines[start_line - 1:end_line])
-                    output = f"\n文件: {abs_path}\n行: [{start_line}-{end_line}]\n{content}" + "\n\n" + "="*80 + "\n\n"
-                    
+                    output = f"\n文件: {abs_path}\n行: [{start_line}-{end_line}]\n{content}" + "\n\n"
+
                     spinner.text = f"文件读取完成: {abs_path}"
                     spinner.ok("✅")
                     return {
@@ -104,7 +106,7 @@ class FileOperationTool:
                 "stdout": "",
                 "stderr": f"Unknown operation: {operation}"
             }
-            
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {
@@ -115,10 +117,10 @@ class FileOperationTool:
 
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute file operations for multiple files
-        
+
         Args:
             args: Dictionary containing operation and files list
-            
+
         Returns:
             Dict containing:
                 - success: Boolean indicating overall success
@@ -127,21 +129,21 @@ class FileOperationTool:
         """
         try:
             operation = args["operation"].strip()
-            
+
             if "files" not in args or not isinstance(args["files"], list):
                 return {
                     "success": False,
                     "stdout": "",
                     "stderr": "files parameter is required and must be a list"
                 }
-            
+
             all_outputs = []
             success = True
-            
+
             for file_info in args["files"]:
                 if not isinstance(file_info, dict) or "path" not in file_info:
                     continue
-                
+
                 content = file_info.get("content", "") if operation == "write" else ""
                 result = self._handle_single_file(
                     operation,
@@ -150,22 +152,22 @@ class FileOperationTool:
                     file_info.get("start_line", 1),
                     file_info.get("end_line", -1)
                 )
-                
+
                 if result["success"]:
                     all_outputs.append(result["stdout"])
                 else:
                     all_outputs.append(f"Error with {file_info['path']}: {result['stderr']}")
                 success = success and result["success"]
-            
+
             # Combine all outputs with separators
             combined_output = "\n\n" + "="*80 + "\n\n".join(all_outputs)
-            
+
             return {
                 "success": success,
                 "stdout": combined_output,
                 "stderr": ""
             }
-                
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {

jarvis/jarvis_tools/find_caller.py

@@ -11,7 +11,7 @@ class FindCallerTool:
     函数调用者查找工具
     使用agent查找代码库中所有调用指定函数的位置
     """
-    
+
     name = "find_caller"
     description = "查找所有调用指定函数的代码位置"
     parameters = {
@@ -50,20 +50,20 @@ class FindCallerTool:
         },
         "required": ["function_name"]
     }
-    
+
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """
         执行调用者查找工具
-        
+
         Args:
             args: 包含参数的字典
-            
+
         Returns:
             包含执行结果的字典
         """
         # 存储原始目录
         original_dir = os.getcwd()
-        
+
         try:
             # 解析参数
             function_name = args.get("function_name", "")
@@ -71,7 +71,7 @@ class FindCallerTool:
             file_extensions = args.get("file_extensions", [])
             exclude_dirs = args.get("exclude_dirs", [])
             objective = args.get("objective", "")
-            
+
             # 验证参数
             if not function_name:
                 return {
@@ -79,23 +79,23 @@ class FindCallerTool:
                     "stdout": "",
                     "stderr": "必须提供函数名称"
                 }
-            
+
             # 创建agent的system prompt
             system_prompt = self._create_system_prompt(
                 function_name, root_dir, file_extensions, exclude_dirs, objective
             )
-            
+
             # 创建agent的summary prompt
             summary_prompt = self._create_summary_prompt(function_name)
-            
+
             # 切换到根目录
             os.chdir(root_dir)
-            
+
             # 构建使用的工具
             from jarvis.jarvis_tools.registry import ToolRegistry
             tool_registry = ToolRegistry()
             tool_registry.use_tools(["execute_shell", "read_code"])
-            
+
             # 创建并运行agent
             caller_agent = Agent(
                 system_prompt=system_prompt,
@@ -107,17 +107,17 @@ class FindCallerTool:
                 execute_tool_confirm=False,
                 auto_complete=True
             )
-            
+
             # 运行agent并获取结果
             task_input = f"查找所有调用 '{function_name}' 函数的代码位置"
             result = caller_agent.run(task_input)
-            
+
             return {
                 "success": True,
                 "stdout": result,
                 "stderr": ""
             }
-                
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {
@@ -128,41 +128,41 @@ class FindCallerTool:
         finally:
             # 恢复原始目录
             os.chdir(original_dir)
-    
-    def _create_system_prompt(self, function_name: str, root_dir: str, 
+
+    def _create_system_prompt(self, function_name: str, root_dir: str,
                              file_extensions: List[str], exclude_dirs: List[str],
                              objective: str) -> str:
         """
         创建Agent的system prompt
-        
+
         Args:
             function_name: 函数名称
             root_dir: 代码库根目录
             file_extensions: 文件扩展名列表
             exclude_dirs: 排除目录列表
             objective: 分析目标
-            
+
         Returns:
             系统提示文本
         """
         file_ext_str = " ".join([f"*{ext}" for ext in file_extensions]) if file_extensions else ""
         exclude_str = " ".join([f"--glob '!{excl}'" for excl in exclude_dirs]) if exclude_dirs else ""
         objective_text = f"\n\n## 分析目标\n{objective}" if objective else ""
-        
+
         search_pattern = f"\\b{function_name}\\s*\\("
-        
+
         return f"""# 函数调用分析专家
 
 ## 任务描述
 查找所有调用 `{function_name}` 函数的代码位置，专注于分析目标所需的信息，生成有针对性的调用分析报告。{objective_text}
 
 ## 工具使用优先级
-1. **优先使用 execute_shell 执行 rg 命令**: 
+1. **优先使用 execute_shell 执行 rg 命令**:
    - `rg "\\b{function_name}\\s*\\(" --type py` 查找Python文件中的调用
    - `rg "\\b{function_name}\\s*\\(" --type js` 查找JavaScript文件中的调用
    - `rg -w "{function_name}" -A 2 -B 2` 查看调用上下文
 
-2. **辅以 read_code**: 
+2. **辅以 read_code**:
    - 找到调用位置后使用read_code阅读上下文
    - 读取关键调用者的完整实现
 
@@ -185,7 +185,7 @@ class FindCallerTool:
 ## 调用者查找工具指南
 
 ### execute_shell 搜索命令
-- **基本搜索**: 
+- **基本搜索**:
   - `rg "\\b{function_name}\\s*\\(" --type=文件类型`
   - 示例: `rg "\\b{function_name}\\s*\\(" --type py` 搜索Python文件中的调用
 
@@ -255,10 +255,10 @@ class FindCallerTool:
     def _create_summary_prompt(self, function_name: str) -> str:
         """
         创建Agent的summary prompt
-        
+
         Args:
             function_name: 函数名称
-            
+
         Returns:
             总结提示文本
         """

jarvis/jarvis_tools/find_methodolopy.py

@@ -0,0 +1,65 @@
+from typing import Dict, Any
+from yaspin import yaspin
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.methodology import load_methodology
+
+class FindMethodologyTool:
+    name = "find_methodology"
+    description = "方法论查找工具，用于在执行过程中查看历史方法论辅助决策"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "query": {
+                "type": "string",
+                "description": "要搜索的查询文本"
+            }
+        },
+        "required": ["query"]
+    }
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        """执行方法论查找操作
+
+        Args:
+            args (Dict): 包含查询文本的参数字典
+
+        Returns:
+            Dict[str, Any]: 包含成功状态、输出内容和错误信息的字典
+        """
+        try:
+            if "query" not in args:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "参数中必须包含查询文本"
+                }
+
+            with yaspin(text="搜索相关方法论...", color="cyan") as spinner:
+                methodology_prompt = load_methodology(args["query"])
+
+                if methodology_prompt:
+                    spinner.text = "找到相关方法论"
+                    spinner.ok("✅")
+                    PrettyOutput.print(methodology_prompt, OutputType.INFO)
+                    return {
+                        "success": True,
+                        "stdout": methodology_prompt,
+                        "stderr": ""
+                    }
+                else:
+                    spinner.text = "未找到相关方法论"
+                    spinner.fail("❌")
+                    return {
+                        "success": True,
+                        "stdout": "未找到相关的方法论",
+                        "stderr": ""
+                    }
+
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"方法论查找失败: {str(e)}"
+            }