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

jarvis/jarvis_smart_shell/main.py

@@ -33,10 +33,10 @@ def execute_command(command: str) -> None:
 
 def process_request(request: str) -> Optional[str]:
     """Process user request and return corresponding shell command
-    
+
     Args:
         request: User's natural language request
-        
+
     Returns:
         Optional[str]: Corresponding shell command, return None if processing fails
     """
@@ -46,7 +46,7 @@ def process_request(request: str) -> Optional[str]:
 
         shell = get_shell_name()
         current_path = os.getcwd()
-        
+
         # Set system prompt
         system_message = """
 # 🤖 Role Definition
@@ -96,18 +96,18 @@ Output: find . -name "*.py"
 
         prefix = f"Current path: {current_path}\n"
         prefix += f"Current shell: {shell}\n"
-        
+
         with yaspin(text="正在生成命令...", color="cyan") as spinner:
             result = model.chat_until_success(prefix + request)
             spinner.ok("✅ 命令生成成功")
-        
+
         # 提取命令
         if result and isinstance(result, str):
             command = result.strip()
             return command
-        
+
         return None
-        
+
     except Exception as e:
         PrettyOutput.print(f"处理请求失败: {str(e)}", OutputType.WARNING)
         return None
@@ -124,25 +124,25 @@ Example:
   %(prog)s "Compress all jpg images"
   %(prog)s "Find documents modified in the last week"
 """)
-    
+
     # 修改为可选参数，添加从stdin读取的支持
     parser.add_argument(
         "request",
         nargs='?',  # 设置为可选参数
         help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
     )
-    
+
     # 解析参数
     args = parser.parse_args()
-    
+
     # 添加标准输入处理
     if not args.request:
         # 检查是否在交互式终端中运行
         args.request = get_multiline_input(tip="请输入您要执行的功能：")
-    
+
     # 处理请求
     command = process_request(args.request)
-    
+
     # 输出结果
     if command:
         execute_command(command)  # 显示并执行命令

jarvis/jarvis_tools/ask_codebase.py

@@ -10,12 +10,12 @@ from jarvis.jarvis_utils.utils import init_env
 
 class AskCodebaseTool:
     """用于智能代码库查询和分析的工具
-    
+
     适用场景：
     - 查询特定功能所在的文件位置（支持所有文件类型）
     - 了解单个功能点的实现原理（支持所有文件类型）
     - 查找特定API或接口的用法（支持所有文件类型）
-    
+
     不适用场景：
     - 跨越多文件的大范围分析
     - 复杂系统架构的全面评估
@@ -45,20 +45,20 @@ class AskCodebaseTool:
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """Execute codebase analysis using an Agent with execute_shell and rag tools
-        
+
         Args:
             args: Dictionary containing:
                 - question: The question to answer, preferably about locating functionality
                   or understanding implementation details of a specific feature
                 - top_k: Optional number of files to analyze
                 - root_dir: Optional root directory of the codebase
-                
+
         Returns:
             Dict containing:
                 - success: Boolean indicating success
                 - stdout: Analysis result
                 - stderr: Error message if any
-                
+
         Note:
             This tool works best for focused questions about specific features or implementations.
             It is not designed for comprehensive multi-file analysis or complex architectural questions.
@@ -66,28 +66,28 @@ class AskCodebaseTool:
         try:
             question = args["question"]
             root_dir = args.get("root_dir", ".")
-            
+
             # Store current directory
             original_dir = os.getcwd()
-            
+
             try:
                 # Change to root_dir
                 os.chdir(root_dir)
-                
+
                 # Get git root directory
                 git_root = find_git_root() or os.getcwd()
-                
+
                 # Create system prompt for the Agent
                 system_prompt = self._create_system_prompt(question, git_root)
-                
+
                 # Create summary prompt for the Agent
                 summary_prompt = self._create_summary_prompt(question)
-                
+
                 # Create tools registry
                 from jarvis.jarvis_tools.registry import ToolRegistry
                 tool_registry = ToolRegistry()
                 tool_registry.use_tools(["execute_shell", "read_code", "rag"])
-                
+
                 # Create and run Agent
                 analyzer_agent = Agent(
                     system_prompt=system_prompt,
@@ -99,11 +99,11 @@ class AskCodebaseTool:
                     execute_tool_confirm=False,
                     auto_complete=self.auto_complete
                 )
-                
+
                 # Run agent and get result
                 task_input = f"回答关于代码库的问题: {question}"
                 result = analyzer_agent.run(task_input)
-                
+
                 return {
                     "success": True,
                     "stdout": result,
@@ -120,14 +120,14 @@ class AskCodebaseTool:
                 "stdout": "",
                 "stderr": error_msg
             }
-            
+
     def _create_system_prompt(self, question: str, git_root: str) -> str:
         """创建Agent的system prompt
-        
+
         Args:
             question: 用户问题
             git_root: Git仓库根目录
-            
+
         Returns:
             系统提示文本
         """
@@ -141,16 +141,16 @@ class AskCodebaseTool:
 - 代码库根目录: {git_root}
 
 ## 工具使用优先级
-1. **绝对优先使用 execute_shell**: 
+1. **绝对优先使用 execute_shell**:
    - 使用 fd 查找文件: `fd -t f -e py` 查找Python文件等
    - 使用 rg 搜索代码: `rg "pattern" --type py` 在Python文件中搜索等
-   - 使用 loc 统计代码: `loc --include="*.py"` 统计Python代码量等
+   - 使用 loc 统计代码: `loc"` 统计代码量
 
-2. **优先使用 read_code**: 
+2. **优先使用 read_code**:
    - 找到相关文件后优先使用read_code读取文件内容
    - 对大文件使用行范围参数读取指定区域
 
-3. **避免使用 rag**: 
+3. **避免使用 rag**:
    - 仅在fd、rg和read_code无法解决问题时作为最后手段
    - 使用rag前必须先尝试使用shell命令解决问题
 
@@ -206,10 +206,10 @@ class AskCodebaseTool:
 
     def _create_summary_prompt(self, question: str) -> str:
         """创建Agent的summary prompt
-        
+
         Args:
             question: 用户问题
-            
+
         Returns:
             总结提示文本
         """
@@ -257,7 +257,7 @@ class AskCodebaseTool:
 def main():
     """
     命令行入口点，允许将ask_codebase作为独立脚本运行
-    
+
     用法示例:
     ```
     python -m jarvis.jarvis_tools.ask_codebase "登录功能在哪个文件实现？" --root_dir /path/to/codebase
@@ -267,22 +267,22 @@ def main():
     import sys
 
     init_env()
-    
+
     # 创建命令行参数解析器
     parser = argparse.ArgumentParser(description="智能代码库查询工具")
     parser.add_argument("question", help="关于代码库的问题")
     parser.add_argument("--root_dir", "-d", default=".", help="代码库根目录路径")
-    
+
     # 解析命令行参数
     args = parser.parse_args()
-    
+
     # 创建并执行工具
     tool = AskCodebaseTool(auto_complete=False)
     result = tool.execute({
         "question": args.question,
         "root_dir": args.root_dir
     })
-    
+
     # 输出结果
     if result["success"]:
         PrettyOutput.print(result["stdout"], OutputType.SUCCESS)

jarvis/jarvis_tools/ask_user.py

@@ -16,35 +16,35 @@ class AskUserTool:
         },
         "required": ["question"]
     }
-        
+
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """Execute the operation of asking the user
-        
+
         Args:
             args: A dictionary containing the question
-            
+
         Returns:
             Dict: A dictionary containing the user's response
         """
         try:
             question = args["question"]
-            
+
             # Display the question
             PrettyOutput.print(f"问题: {question}", OutputType.SYSTEM)
-            
+
             # Get user input
             user_response = get_multiline_input("请输入您的答案 (输入空行结束)")
-            
+
             return {
                 "success": True,
                 "stdout": user_response,
                 "stderr": ""
             }
-            
+
         except Exception as e:
             return {
                 "success": False,
                 "stdout": "",
                 "stderr": f"Failed to ask user: {str(e)}"
-            } 
+            }

jarvis/jarvis_tools/base.py

@@ -2,11 +2,11 @@ from typing import Dict, Any, Callable
 import json
 class Tool:
     """工具类，用于封装工具的基本信息和执行方法"""
-    
+
     def __init__(self, name: str, description: str, parameters: Dict, func: Callable):
         """
         初始化工具对象
-        
+
         参数:
             name (str): 工具名称
             description (str): 工具描述
@@ -27,10 +27,10 @@ class Tool:
     def execute(self, arguments: Dict) -> Dict[str, Any]:
         """
         执行工具函数
-        
+
         参数:
             arguments (Dict): 工具执行所需的参数
-            
+
         返回:
             Dict[str, Any]: 工具执行结果
         """

jarvis/jarvis_tools/chdir.py

@@ -14,19 +14,19 @@ class ChdirTool:
         },
         "required": ["path"]
     }
-    
+
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """执行目录切换操作，并提供全面的错误处理。
-        
+
         参数:
             args: 包含 'path' 键的字典，目标目录路径
-            
+
         返回:
             字典，包含以下内容：
                 - success: 布尔值，表示操作状态
                 - stdout: 成功消息或空字符串
                 - stderr: 错误消息或空字符串
-                
+
         异常处理:
             处理并返回适当的错误消息：
                 - 不存在的路径
@@ -39,7 +39,7 @@ class ChdirTool:
             # 规范化并展开输入路径（处理 ~ 和相对路径）
             path = os.path.expanduser(args["path"].strip())
             path = os.path.abspath(path)
-            
+
             # 验证目标路径是否存在
             if not os.path.exists(path):
                 return {
@@ -47,7 +47,7 @@ class ChdirTool:
                     "stdout": "",
                     "stderr": f"目录不存在: {path}"
                 }
-                
+
             # 确保路径指向的是目录，而不是文件
             if not os.path.isdir(path):
                 return {
@@ -55,17 +55,17 @@ class ChdirTool:
                     "stdout": "",
                     "stderr": f"路径不是目录: {path}"
                 }
-                
+
             # 获取当前目录并尝试切换到新路径
             old_path = os.getcwd()
             os.chdir(path)
-            
+
             return {
                 "success": True,
                 "stdout": f"成功切换工作目录:\n原目录: {old_path}\n新目录: {path}",
                 "stderr": ""
             }
-            
+
         # 处理用户没有目录访问权限的情况
         except PermissionError:
             return {

jarvis/jarvis_tools/code_review.py

@@ -53,14 +53,14 @@ class CodeReviewTool:
         try:
             review_type = args.get("review_type", "current").strip()
             root_dir = args.get("root_dir", ".")
-            
+
             # Store current directory
             original_dir = os.getcwd()
-            
+
             try:
                 # Change to root_dir
                 os.chdir(root_dir)
-                
+
                 # Build git diff command based on review type
                 with yaspin(text="正在获取代码变更...", color="cyan") as spinner:
                     if review_type == "commit":
@@ -93,7 +93,7 @@ class CodeReviewTool:
                         diff_cmd = ReadCodeTool().execute({"files": [{"path": file_path}]})["stdout"]
                     else:  # current changes
                         diff_cmd = "git diff HEAD | cat -"
-                
+
                     # Execute git diff command
                     try:
                         diff_output = subprocess.check_output(diff_cmd, shell=True, text=True)
@@ -224,9 +224,9 @@ class CodeReviewTool:
 - **位置**: [起始行号-结束行号]
 - **分类**: [使用SCRIPPPS框架中相关类别]
 - **严重程度**: [P0/P1/P2/P3] - [简要说明判定理由]
-- **问题描述**: 
+- **问题描述**:
   [详细描述问题，包括技术原理和潜在影响]
-- **改进建议**: 
+- **改进建议**:
   ```
   [提供完整、可执行的代码示例，而非概念性建议]
   ```
@@ -259,14 +259,14 @@ class CodeReviewTool:
             finally:
                 # Always restore original directory
                 os.chdir(original_dir)
-                
+
         except Exception as e:
             return {
                 "success": False,
                 "stdout": {},
                 "stderr": f"Review failed: {str(e)}"
             }
-        
+
 
 def extract_code_report(result: str) -> str:
     sm = re.search(ot("REPORT")+r'\n(.*?)\n'+ct("REPORT"), result, re.DOTALL)
@@ -279,33 +279,33 @@ def main():
     import argparse
 
     init_env()
-    
+
     parser = argparse.ArgumentParser(description='Autonomous code review tool')
     subparsers = parser.add_subparsers(dest='type')
-    
+
     # Commit subcommand
     commit_parser = subparsers.add_parser('commit', help='Review specific commit')
     commit_parser.add_argument('commit', help='Commit SHA to review')
-    
+
     # Current subcommand
     current_parser = subparsers.add_parser('current', help='Review current changes')
-    
+
     # Range subcommand
     range_parser = subparsers.add_parser('range', help='Review commit range')
     range_parser.add_argument('start_commit', help='Start commit SHA')
     range_parser.add_argument('end_commit', help='End commit SHA')
-    
+
     # File subcommand
     file_parser = subparsers.add_parser('file', help='Review specific file')
     file_parser.add_argument('file', help='File path to review')
-    
+
     # Common arguments
     parser.add_argument('--root-dir', type=str, help='Root directory of the codebase', default=".")
-    
+
     # Set default subcommand to 'current'
     parser.set_defaults(type='current')
     args = parser.parse_args()
-    
+
     tool = CodeReviewTool()
     tool_args = {
         "review_type": args.type,
@@ -318,14 +318,14 @@ def main():
         tool_args["end_commit"] = args.end_commit
     elif args.type == 'file':
         tool_args["file_path"] = args.file
-    
+
     result = tool.execute(tool_args)
-    
+
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
-        
+
     else:
         PrettyOutput.print(result["stderr"], OutputType.WARNING)
 

jarvis/jarvis_tools/create_code_agent.py

@@ -8,7 +8,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class CreateCodeAgentTool:
     """用于管理代码开发工作流的工具"""
-    
+
     name = "create_code_agent"
     description = "技术代码实现和开发过程管理工具"
     parameters = {
@@ -25,16 +25,16 @@ class CreateCodeAgentTool:
             "default": "."
         }
     }
-    
-    
+
+
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             requirement = args.get("requirement", "")
             root_dir = args.get("root_dir", ".")
-            
+
             # Store current directory
             original_dir = os.getcwd()
-            
+
             try:
                 # Change to root_dir
                 os.chdir(root_dir)
@@ -44,7 +44,7 @@ class CreateCodeAgentTool:
                         "stderr": "Requirement must be provided",
                         "stdout": ""
                     }
-                
+
                 # Step 1: Handle uncommitted changes
                 start_commit = None
                 if has_uncommitted_changes():
@@ -57,18 +57,18 @@ class CreateCodeAgentTool:
                             "stderr": "Failed to commit changes: " + result["stderr"],
                             "stdout": ""
                         }
-                
+
                 # Get current commit hash
                 start_commit = get_latest_commit_hash()
-                
+
                 # Step 2: Development
                 PrettyOutput.print("开始开发...", OutputType.INFO)
                 agent = CodeAgent()
                 agent.run(requirement)
-                
+
                 # Get new commit hash after development
                 end_commit = get_latest_commit_hash()
-                
+
                 # Step 3: Code Review
                 PrettyOutput.print("开始代码审查...", OutputType.INFO)
                 reviewer = CodeReviewTool()
@@ -78,17 +78,17 @@ class CreateCodeAgentTool:
                     "end_commit": end_commit,
                     "root_dir": root_dir
                 })
-                
+
                 if not review_result["success"]:
                     return {
                         "success": False,
                         "stderr": "Code review failed: " + review_result["stderr"],
                         "stdout": ""
                     }
-                
+
                 # Step 4: Generate Summary
                 summary = f"""开发总结:
-                
+
 开始提交: {start_commit}
 结束提交: {end_commit}
 
@@ -98,7 +98,7 @@ class CreateCodeAgentTool:
 代码审查结果:
 {extract_code_report(review_result["stdout"])}
 """
-                
+
                 return {
                     "success": True,
                     "stdout": summary,
@@ -107,7 +107,7 @@ class CreateCodeAgentTool:
             finally:
                 # Always restore original directory
                 os.chdir(original_dir)
-            
+
         except Exception as e:
             return {
                 "success": False,

jarvis/jarvis_tools/execute_python_script.py

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