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

jarvis/jarvis_dev/main.py

@@ -67,20 +67,20 @@ PM_PROMPT = f"""
 to: [角色]
 content: |
   # [任务主题]
-  
+
   ## 背景与目标
   [提供任务背景和期望达成的目标]
-  
+
   ## 相关代码
   - [代码路径及其分析结果]
-  
+
   ## 具体要求
   1. [基于代码事实的明确要求1]
   2. [基于代码事实的明确要求2]
-  
+
   ## 预期交付物
   - [具体交付物及其格式要求]
-  
+
   ## 时间与优先级
   - 优先级：[高/中/低]
   - 期望完成时间：[时间点]
@@ -295,7 +295,7 @@ arguments:
         - [详细功能描述]
         - [输入/输出规范]
         - [错误处理要求]
-        
+
         技术要求：
         - [编程语言/框架]
         - [代码风格]
@@ -360,7 +360,7 @@ arguments:
         - 测试正常功能路径
         - 测试边界条件和异常情况
         - 测试错误处理逻辑
-        
+
         技术要求：
         - 使用[测试框架]
         - 模拟外部依赖
@@ -381,10 +381,10 @@ def create_dev_team() -> MultiAgent:
 
     PM_output_handler = ToolRegistry()
     PM_output_handler.use_tools([
-        "ask_user", 
-        "file_operation", 
-        "search_web", 
-        "rag", 
+        "ask_user",
+        "file_operation",
+        "search_web",
+        "rag",
         "execute_shell",
         "read_webpage",
         "project_analyzer",
@@ -394,39 +394,35 @@ def create_dev_team() -> MultiAgent:
 
     BA_output_handler = ToolRegistry()
     BA_output_handler.use_tools([
-        "ask_user", 
-        "file_operation", 
-        "search_web", 
-        "rag", 
+        "ask_user",
+        "file_operation",
+        "search_web",
+        "rag",
         "execute_shell",
-        "read_webpage", 
-        "select_code_files",
+        "read_webpage",
         "methodology",
         "ask_codebase"
     ])
 
     SA_output_handler = ToolRegistry()
     SA_output_handler.use_tools([
-        "file_operation", 
-        "search_web", 
-        "rag", 
-        "ask_codebase", 
+        "file_operation",
+        "search_web",
+        "rag",
+        "ask_codebase",
         "execute_shell",
         "project_analyzer",
         "file_analyzer",
         "function_analyzer",
         "read_code",
-        "select_code_files",
         "methodology"
     ])
-    
+
     TL_output_handler = ToolRegistry()
     TL_output_handler.use_tools([
-        "file_operation", 
-        "ask_codebase", 
-        "lsp_get_diagnostics", 
-        "lsp_find_references", 
-        "lsp_find_definition", 
+        "file_operation",
+        "ask_codebase",
+        "lsp_get_diagnostics",
         "execute_shell",
         "code_review",
         "find_symbol",
@@ -434,35 +430,32 @@ def create_dev_team() -> MultiAgent:
         "function_analyzer",
         "project_analyzer"
     ])
-    
+
     DEV_output_handler = ToolRegistry()
     DEV_output_handler.use_tools([
-        "create_code_agent", 
-        "file_operation", 
-        "ask_codebase", 
+        "create_code_agent",
+        "file_operation",
+        "ask_codebase",
         "execute_shell",
-        "lsp_find_definition",
-        "lsp_find_references",
         "find_symbol",
         "function_analyzer",
         "file_analyzer",
         "read_code",
         "create_sub_agent"
     ])
-    
+
     QA_output_handler = ToolRegistry()
     QA_output_handler.use_tools([
-        "create_code_agent", 
-        "file_operation", 
-        "ask_codebase", 
+        "create_code_agent",
+        "file_operation",
+        "ask_codebase",
         "execute_shell",
         "lsp_get_diagnostics",
         "code_review",
         "execute_shell_script",
         "read_code",
-        "select_code_files"
     ])
-    
+
     # Update PM prompt with tool usage guidance
     PM_PROMPT_EXTENSION = """
 ## 工具使用指南
@@ -486,7 +479,7 @@ def create_dev_team() -> MultiAgent:
 
 文档命名需规范，内容需要结构化，使用Markdown格式，便于团队成员理解和跟进。
 """
-    
+
     # Update BA prompt with tool usage guidance
     BA_PROMPT_EXTENSION = """
 ## 工具使用指南
@@ -496,7 +489,6 @@ def create_dev_team() -> MultiAgent:
 - **rag**：访问项目知识库，参考相似需求历史
 - **execute_shell**：查询系统环境和配置信息
 - **read_webpage**：收集用户体验和行业趋势信息
-- **select_code_files**：了解现有代码中与需求相关的部分
 - **methodology**：应用需求分析和用户故事映射方法论
 - **ask_codebase**：分析代码库中的功能实现，了解现有系统能力和限制，分析业务逻辑
 
@@ -511,7 +503,7 @@ def create_dev_team() -> MultiAgent:
 
 文档需要结构化，使用Markdown格式，包含清晰的需求描述、优先级、验收标准和依赖关系。
 """
-    
+
     # Update SA prompt with tool usage guidance
     SA_PROMPT_EXTENSION = """
 ## 工具使用指南
@@ -524,7 +516,6 @@ def create_dev_team() -> MultiAgent:
 - **file_analyzer**：深入分析关键文件的结构和功能
 - **function_analyzer**：分析核心函数的实现和设计
 - **read_code**：阅读和理解关键代码段
-- **select_code_files**：选择并分析与架构相关的代码文件
 - **methodology**：应用架构设计方法论和模式
 
 ## 文档管理规范
@@ -538,15 +529,13 @@ def create_dev_team() -> MultiAgent:
 
 文档需使用图表、表格等方式清晰展示架构设计，包含各组件职责、接口、性能考量及安全措施。
 """
-    
+
     # Update TL prompt with tool usage guidance
     TL_PROMPT_EXTENSION = """
 ## 工具使用指南
 - **file_operation**：管理技术文档和指导文件
 - **ask_codebase**：分析代码库，理解实现细节
 - **lsp_get_diagnostics**：检查代码问题和警告
-- **lsp_find_references**：查找代码引用关系
-- **lsp_find_definition**：查找符号定义位置
 - **execute_shell**：执行开发工具和命令
 - **code_review**：进行代码审查，确保代码质量
 - **find_symbol**：查找关键符号在代码中的使用
@@ -566,7 +555,7 @@ def create_dev_team() -> MultiAgent:
 
 文档需包含清晰的技术指导、代码质量标准、任务分解和时间估计，便于开发团队执行。
 """
-    
+
     # Update DEV prompt with tool usage guidance
     DEV_PROMPT_EXTENSION = """
 ## 工具使用指南
@@ -574,8 +563,6 @@ def create_dev_team() -> MultiAgent:
 - **file_operation**：管理源代码和配置文件
 - **ask_codebase**：了解代码库实现细节
 - **execute_shell**：执行开发命令和测试脚本
-- **lsp_find_definition**：查找符号定义位置
-- **lsp_find_references**：查找代码引用关系
 - **find_symbol**：查找关键符号在代码中的使用
 - **function_analyzer**：分析函数实现和优化空间
 - **file_analyzer**：分析文件结构和功能
@@ -594,7 +581,7 @@ def create_dev_team() -> MultiAgent:
 
 文档需要包含功能描述、使用示例、参数说明和注意事项，便于其他开发者理解和使用。
 """
-    
+
     # Update QA prompt with tool usage guidance
     QA_PROMPT_EXTENSION = """
 ## 工具使用指南
@@ -606,7 +593,6 @@ def create_dev_team() -> MultiAgent:
 - **code_review**：从质量保证角度审查代码
 - **execute_shell_script**：执行自动化测试脚本
 - **read_code**：阅读和理解代码以设计测试用例
-- **select_code_files**：选择需要测试的关键代码文件
 
 ## 文档管理规范
 每一步测试或质量评估后，必须使用file_operation工具将结论性输出记录到测试文档中：
@@ -620,7 +606,7 @@ def create_dev_team() -> MultiAgent:
 
 测试文档需包含测试范围、测试环境、测试用例、预期结果、实际结果和缺陷级别，便于跟踪和修复。
 """
-    
+
     # Append tool guidance to each role's prompt
     PM_PROMPT_WITH_TOOLS = PM_PROMPT + PM_PROMPT_EXTENSION
     BA_PROMPT_WITH_TOOLS = BA_PROMPT + BA_PROMPT_EXTENSION
@@ -628,7 +614,7 @@ def create_dev_team() -> MultiAgent:
     TL_PROMPT_WITH_TOOLS = TL_PROMPT + TL_PROMPT_EXTENSION
     DEV_PROMPT_WITH_TOOLS = DEV_PROMPT + DEV_PROMPT_EXTENSION
     QA_PROMPT_WITH_TOOLS = QA_PROMPT + QA_PROMPT_EXTENSION
-    
+
     # Create configurations for each role
     configs = [
         dict(
@@ -674,27 +660,27 @@ def create_dev_team() -> MultiAgent:
             platform=PlatformRegistry().get_thinking_platform(),
         )
     ]
-    
+
     return MultiAgent(configs, "PM")
 
 def main():
     """Main entry point for the development team simulation."""
 
     init_env()
-    
+
     # Create the development team
     dev_team = create_dev_team()
-    
+
     # Start interaction loop
     while True:
         try:
             user_input = get_multiline_input("\nEnter your request (or press Enter to exit): ")
             if not user_input:
                 break
-                
+
             result = dev_team.run("My requirement: " + user_input)
             PrettyOutput.print(result, output_type=OutputType.SYSTEM)
-            
+
         except KeyboardInterrupt:
             PrettyOutput.print("Exiting...", output_type=OutputType.SYSTEM)
             break

jarvis/jarvis_git_details/main.py

@@ -0,0 +1,179 @@
+"""Git Commit分析工具模块
+
+该模块提供了一个GitCommitAnalyzer类，用于获取和分析指定Git commit的详细信息，
+包括提交信息、修改内容以及详细的功能、原因和逻辑分析。
+"""
+
+import os
+import re
+import subprocess
+from typing import Dict, Any
+
+from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import ct, ot, init_env
+
+
+class GitCommitAnalyzer:
+    """Git Commit分析器
+
+    该类用于获取和分析指定Git commit的详细信息，包括：
+    - 完整的提交信息
+    - 修改的文件列表和状态
+    - 修改的功能、原因和逻辑分析
+    """
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """执行commit分析
+
+        Args:
+            args: 包含commit_sha和root_dir的参数字典
+
+        Returns:
+            包含分析结果的字典，包括：
+            - success: 操作是否成功
+            - stdout: 包含commit_info和diff_content的结果
+            - stderr: 错误信息（如果操作失败）
+        """
+        try:
+            commit_sha = args["commit_sha"]
+            root_dir = args.get("root_dir", ".")
+
+            # Store current directory
+            original_dir = os.getcwd()
+
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
+
+                # 获取commit详细信息
+                commit_info = subprocess.check_output(
+                    f"git show {commit_sha} --pretty=fuller",
+                    shell=True,
+                    text=True
+                )
+
+                # 获取commit修改内容
+                diff_content = subprocess.check_output(
+                    f"git show {commit_sha} --patch",
+                    shell=True,
+                    text=True
+                )
+
+                # 分析commit的功能、原因和逻辑
+                system_prompt = """你是一位资深代码分析专家，拥有多年代码审查和重构经验。你需要对Git commit进行深入分析，包括：
+1. 修改的功能：明确说明本次commit实现或修改了哪些功能
+2. 修改的原因：分析为什么要进行这些修改（如修复bug、优化性能、添加新功能等）
+3. 修改的逻辑：详细说明代码修改的具体实现逻辑和思路
+4. 影响范围：评估本次修改可能影响的其他模块或功能
+5. 代码质量：分析代码风格、可读性和可维护性
+6. 测试覆盖：评估是否需要添加或修改测试用例
+7. 最佳实践：检查代码是否符合行业最佳实践和项目规范
+
+请确保分析内容：
+- 准确反映commit的实际修改
+- 提供足够的技术细节
+- 保持结构清晰，便于理解
+- 重点关注关键修改和潜在风险"""
+
+                tool_registry = ToolRegistry()
+                agent = Agent(
+                    system_prompt=system_prompt,
+                    name="Commit Analysis Agent",
+                    summary_prompt=f"""请生成一份详细的commit分析报告，包含以下内容：
+{ot("REPORT")}
+# 功能分析
+[说明本次commit实现或修改了哪些功能]
+
+# 修改原因
+[分析进行这些修改的原因，如修复bug、优化性能、添加新功能等]
+
+# 实现逻辑
+[详细说明代码修改的具体实现逻辑和思路]
+
+# 影响范围
+[评估本次修改可能影响的其他模块或功能]
+
+# 代码质量
+[分析代码风格、可读性和可维护性]
+
+# 测试覆盖
+[评估是否需要添加或修改测试用例]
+
+# 最佳实践
+[检查代码是否符合行业最佳实践和项目规范]
+{ct("REPORT")}""",
+                    output_handler=[tool_registry],
+                    platform=PlatformRegistry().get_thinking_platform(),
+                    auto_complete=True
+                )
+
+                analysis_result = agent.run(diff_content)
+
+                return {
+                    "success": True,
+                    "stdout": {
+                        "commit_info": commit_info,
+                        "diff_content": diff_content,
+                        "analysis_result": analysis_result
+                    },
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
+        except subprocess.CalledProcessError as error:
+            return {
+                "success": False,
+                "stdout": {},
+                "stderr": f"Failed to analyze commit: {str(error)}"
+            }
+
+
+def extract_analysis_report(result: str) -> str:
+    """从分析结果中提取报告内容
+
+    Args:
+        result: 包含REPORT标签的完整分析结果字符串
+
+    Returns:
+        提取的报告内容，如果未找到REPORT标签则返回空字符串
+    """
+    search_match = re.search(ot("REPORT")+r'\n(.*?)\n'+ct("REPORT"), result, re.DOTALL)
+    if search_match:
+        return search_match.group(1)
+    return ""
+
+
+def main():
+    """主函数，用于命令行接口"""
+    import argparse
+
+    init_env()
+
+    parser = argparse.ArgumentParser(description='Git Commit Analyzer')
+    parser.add_argument('commit', help='Commit SHA to analyze')
+    parser.add_argument('--root-dir', type=str, help='Root directory of the codebase', default=".")
+
+    args = parser.parse_args()
+
+    analyzer = GitCommitAnalyzer()
+    result = analyzer.execute({
+        "commit_sha": args.commit,
+        "root_dir": args.root_dir
+    })
+
+    if result["success"]:
+        PrettyOutput.section("Commit Information:", OutputType.SUCCESS)
+        PrettyOutput.print(result["stdout"]["commit_info"], OutputType.CODE)
+        PrettyOutput.section("Analysis Report:", OutputType.SUCCESS)
+        report = extract_analysis_report(result["stdout"]["analysis_result"])
+        PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
+    else:
+        PrettyOutput.print(result["stderr"], OutputType.WARNING)
+
+
+if __name__ == "__main__":
+    main()

jarvis/jarvis_git_squash/main.py

@@ -10,11 +10,11 @@ from jarvis.jarvis_utils.utils import init_env, user_confirm
 class GitSquashTool:
     name = "git_squash_agent"
     description = "Squash commits interactively using a base commit hash"
-    
+
     def _confirm_squash(self) -> bool:
         """Prompt user for confirmation to squash commits"""
         return user_confirm("是否确认压缩提交?", default=True)
-    
+
     def _reset_to_commit(self, commit_hash: str) -> bool:
         """Perform soft reset to specified commit hash"""
         try:
@@ -26,31 +26,31 @@ class GitSquashTool:
             return True
         except Exception:
             return False
-    
+
     def execute(self, args: Dict):
         """Execute the squash operation"""
         try:
             if not self._confirm_squash():
                 PrettyOutput.print("操作已取消", OutputType.WARNING)
                 return
-            
+
             if not self._reset_to_commit(args['commit_hash']):
                 PrettyOutput.print("重置到指定提交失败", OutputType.WARNING)
                 return
-            
+
             # Use existing GitCommitTool for new commit
             commit_tool = GitCommitTool()
             commit_tool.execute({"lang": args.get('lang', 'Chinese')})
         except Exception as e:
             PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
-            
+
 def main():
     init_env()
     parser = argparse.ArgumentParser(description='Git squash tool')
     parser.add_argument('commit_hash', type=str, help='Base commit hash to squash from')
     parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
     args = parser.parse_args()
-    
+
     tool = GitSquashTool()
     tool.execute({
         'commit_hash': args.commit_hash,

jarvis/jarvis_lsp/base.py

@@ -3,78 +3,36 @@ from typing import List, Dict, Optional, Tuple, Any, Union
 
 class BaseLSP(ABC):
     """Base class for Language Server Protocol integration.
-    
+
     Core LSP features needed for LLM-based code editing:
     1. Code navigation and analysis
     2. Code modification validation
     3. Diagnostic information
     4. Symbol analysis
     """
-    
+
     language: Union[str, List[str]] = ""  # Language identifier, should be overridden by subclasses
-    
+
     @abstractmethod
     def initialize(self, workspace_path: str) -> bool:
         """Initialize LSP server for the workspace.
-        
+
         Args:
             workspace_path: Root path of the workspace
-            
+
         Returns:
             bool: True if initialization successful
         """
         return False
-    
-    @abstractmethod
-    def find_references(self, file_path: str, position: Tuple[int, int]) -> List[Dict[str, Any]]:
-        """Find all references of symbol at position.
-        
-        Args:
-            file_path: Path to the file
-            position: (line, character) tuple
-            
-        Returns:
-            List of references with location info:
-            [
-                {
-                    "uri": "file path",
-                    "range": {
-                        "start": {"line": int, "character": int},
-                        "end": {"line": int, "character": int}
-                    }
-                }
-            ]
-        """
-        return []
-    
-    @abstractmethod
-    def find_definition(self, file_path: str, position: Tuple[int, int]) -> Optional[Dict[str, Any]]:
-        """Find definition of symbol at position.
-        
-        Args:
-            file_path: Path to the file
-            position: (line, character) tuple
-            
-        Returns:
-            Location of definition:
-            {
-                "uri": "file path",
-                "range": {
-                    "start": {"line": int, "character": int},
-                    "end": {"line": int, "character": int}
-                }
-            }
-        """
-        return None
-    
-    
+
+
     @abstractmethod
     def get_diagnostics(self, file_path: str) -> List[Dict[str, Any]]:
         """Get diagnostics (errors, warnings) for file.
-        
+
         Args:
             file_path: Path to the file
-            
+
         Returns:
             List of diagnostic items:
             [
@@ -100,8 +58,8 @@ class BaseLSP(ABC):
             ]
         """
         return []
-    
-    
+
+
     def shutdown(self):
         """Shutdown LSP server cleanly."""
         pass