jarvis-ai-assistant 0.1.130__py3-none-any.whl → 0.1.131__py3-none-any.whl

jarvis/jarvis_tools/create_code_agent.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any
+import os
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.code_review import CodeReviewTool, extract_code_report
@@ -11,63 +12,83 @@ class CreateCodeAgentTool:
     name = "create_code_agent"
     description = "技术代码实现和开发过程管理工具"
     parameters = {
-        "requirement": "代码实现的技术规范"
+        "requirement": """代码实现的技术规范，必须包含以下完整信息：
+1. 项目代码目录 - 项目根目录的绝对路径
+2. 项目功能 - 项目的主要功能和目标
+3. 本次要实现的feature - 本次开发要完成的具体功能需求
+4. 涉及的文件 - 需要修改或新增的文件列表
+5. 额外需要注意的信息 - 开发时需要额外注意的信息
+""",
+        "root_dir": {
+            "type": "string",
+            "description": "代码库根目录路径（可选）",
+            "default": "."
+        }
     }
     
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             requirement = args.get("requirement", "")
-            if not requirement:
-                return {
-                    "success": False,
-                    "stderr": "Requirement must be provided",
-                    "stdout": ""
-                }
+            root_dir = args.get("root_dir", ".")
             
-            # Step 1: Handle uncommitted changes
-            start_commit = None
-            if has_uncommitted_changes():
-                PrettyOutput.print("发现未提交的更改，正在提交...", OutputType.INFO)
-                git_commiter = GitCommitTool()
-                result = git_commiter.execute({})
-                if not result["success"]:
+            # Store current directory
+            original_dir = os.getcwd()
+            
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
+                if not requirement:
                     return {
                         "success": False,
-                        "stderr": "Failed to commit changes: " + result["stderr"],
+                        "stderr": "Requirement must be provided",
                         "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()
-            review_result = reviewer.execute({
-                "review_type": "range",
-                "start_commit": start_commit,
-                "end_commit": end_commit
-            })
-            
-            if not review_result["success"]:
-                return {
-                    "success": False,
-                    "stderr": "Code review failed: " + review_result["stderr"],
-                    "stdout": ""
-                }
-            
-            # Step 4: Generate Summary
-            summary = f"""开发总结:
-            
+                
+                # Step 1: Handle uncommitted changes
+                start_commit = None
+                if has_uncommitted_changes():
+                    PrettyOutput.print("发现未提交的更改，正在提交...", OutputType.INFO)
+                    git_commiter = GitCommitTool()
+                    result = git_commiter.execute({})
+                    if not result["success"]:
+                        return {
+                            "success": False,
+                            "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()
+                review_result = reviewer.execute({
+                    "review_type": "range",
+                    "start_commit": start_commit,
+                    "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}
 
@@ -77,12 +98,15 @@ class CreateCodeAgentTool:
 代码审查结果:
 {extract_code_report(review_result["stdout"])}
 """
-            
-            return {
-                "success": True,
-                "stdout": summary,
-                "stderr": ""
-            }
+                
+                return {
+                    "success": True,
+                    "stdout": summary,
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
             
         except Exception as e:
             return {
@@ -90,23 +114,3 @@ class CreateCodeAgentTool:
                 "stderr": f"Development workflow failed: {str(e)}",
                 "stdout": ""
             }
-
-def main():
-    """CLI entry point"""
-    import argparse
-    
-    parser = argparse.ArgumentParser(description='Code development workflow tool')
-    parser.add_argument('requirement', help='Development requirement or task description')
-    
-    args = parser.parse_args()
-    
-    tool = CreateCodeAgentTool()
-    result = tool.execute({"requirement": args.requirement})
-    
-    if result["success"]:
-        PrettyOutput.print(result["stdout"], OutputType.SUCCESS)
-    else:
-        PrettyOutput.print(result["stderr"], OutputType.WARNING)
-
-if __name__ == "__main__":
-    main()

jarvis/jarvis_tools/create_sub_agent.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any
+import os
 
 
 from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
@@ -30,8 +31,13 @@ class SubAgentTool:
                 "description": "任务的完成目标",
                 "default": ""
             },
+            "root_dir": {
+                "type": "string",
+                "description": "任务执行的根目录路径（可选）",
+                "default": "."
+            }
         },
-        "required": ["agent_name", "task", "context", "goal"]
+        "required": ["agent_name", "task"]
     }
 
 
@@ -42,6 +48,7 @@ class SubAgentTool:
             task = args["task"]
             context = args.get("context", "")
             goal = args.get("goal", "")
+            root_dir = args.get("root_dir", ".")
 
             PrettyOutput.print(f"创建子代理: {agent_name}", OutputType.INFO)
 
@@ -53,22 +60,32 @@ class SubAgentTool:
                 task_description += f"\n\nCompletion goal:\n{goal}"
 
 
-            # Create sub-agent
-            sub_agent = Agent(
-                system_prompt=origin_agent_system_prompt,
-                name=f"Agent({agent_name})",
-                is_sub_agent=True
-            )
+            # Store current directory
+            original_dir = os.getcwd()
 
-            # Run sub-agent, pass file list
-            PrettyOutput.print("子代理开始执行任务...", OutputType.INFO)
-            result = sub_agent.run(task_description)
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
 
-            return {
-                "success": True,
-                "stdout": f"Sub-agent task completed\n\n{result}",
-                "stderr": ""
-            }
+                # Create sub-agent
+                sub_agent = Agent(
+                    system_prompt=origin_agent_system_prompt,
+                    name=f"Agent({agent_name})",
+                    is_sub_agent=True
+                )
+
+                # Run sub-agent, pass file list
+                PrettyOutput.print("子代理开始执行任务...", OutputType.INFO)
+                result = sub_agent.run(task_description)
+
+                return {
+                    "success": True,
+                    "stdout": f"Sub-agent task completed\n\n{result}",
+                    "stderr": ""
+                }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
 
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)

jarvis/jarvis_tools/execute_shell.py

@@ -74,11 +74,11 @@ class ShellTool:
             tee_command = f"script -q -c '{escaped_command}' {output_file}"
             
             # Execute command and capture return code
-            return_code = os.system(tee_command)
+            os.system(tee_command)
             
             # Read and process output file
             try:
-                with open(output_file, 'r', encoding='utf-8', errors='replace') as f:
+                with open(output_file, 'r', encoding='utf-8', errors='ignore') as f:
                     output = f.read()
                     # Remove header and footer added by script command
                     if output:

jarvis/jarvis_tools/execute_shell_script.py

@@ -33,7 +33,7 @@ class ShellScriptTool:
             # Create temporary script file
             script_path = os.path.join(tempfile.gettempdir(), f"jarvis_script_{os.getpid()}.sh")
             try:
-                with open(script_path, 'w', encoding='utf-8') as f:
+                with open(script_path, 'w', encoding='utf-8', errors="ignore") as f:
                     f.write(script_content)
                 # Use execute_shell to run the script
                 from jarvis.jarvis_tools.execute_shell import ShellTool

jarvis/jarvis_tools/file_operation.py

@@ -55,7 +55,7 @@ class FileOperationTool:
                             "stderr": "File too large (>10MB)"
                         }
                         
-                    with open(abs_path, 'r', encoding='utf-8') as f:
+                    with open(abs_path, 'r', encoding='utf-8', errors="ignore") as f:
                         lines = f.readlines()
                     
                     
@@ -90,7 +90,7 @@ class FileOperationTool:
             elif operation == "write":
                 with yaspin(text=f"正在写入文件: {abs_path}...", color="cyan") as spinner:
                     os.makedirs(os.path.dirname(os.path.abspath(abs_path)), exist_ok=True)
-                    with open(abs_path, 'w', encoding='utf-8') as f:
+                    with open(abs_path, 'w', encoding='utf-8', errors="ignore") as f:
                         f.write(content)
                     spinner.text = f"文件写入完成: {abs_path}"
                     spinner.ok("✅")

jarvis/jarvis_tools/git_commiter.py

@@ -8,6 +8,7 @@ from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 import sys
 import argparse
+import os
 
 from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -24,6 +25,11 @@ class GitCommitTool:
                 "type": "string",
                 "description": "提交信息的语言",
                 "default": "Chinese"
+            },
+            "root_dir": {
+                "type": "string",
+                "description": "Git仓库的根目录路径（可选）",
+                "default": "."
             }
         },
         "required": []
@@ -51,83 +57,95 @@ class GitCommitTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process with support for multi-line messages and special characters"""
         try:
-            find_git_root()
-            if not has_uncommitted_changes():
-                PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
-                return {"success": True, "stdout": "No changes to commit", "stderr": ""}
+            root_dir = args.get("root_dir", ".")
             
-            with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
-                # 添加文件
-                spinner.text = "正在添加文件到提交..."
-                subprocess.Popen(
-                    ["git", "add", "."],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL
-                ).wait()
-                spinner.write("✅ 添加文件到提交")
-                
-                # 获取差异
-                spinner.text = "正在获取代码差异..."
-                process = subprocess.Popen(
-                    ["git", "diff", "--cached", "--exit-code"],
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE
-                )
-                diff = process.communicate()[0].decode()
-                spinner.write("✅ 获取差异")
+            # Store current directory
+            original_dir = os.getcwd()
+            
+            try:
+                # Change to root_dir
+                os.chdir(root_dir)
                 
-                # 生成提交信息
-                spinner.text = "正在生成提交消息..."
-                prompt = f'''根据以下规则生成提交信息：
-                提交信息应使用{args.get('lang', '中文')}书写
-    # 必需结构
-    必须使用以下格式：
-    <COMMIT_MESSAGE>
-    <类型>(<范围>): <主题>
-    使用祈使语气描述变更内容
-    </COMMIT_MESSAGE>
-    # 格式规则
-    1. 类型: fix, feat, docs, style, refactor, test, chore
-    2. 范围表示模块 (例如: auth, database)
-    3. 主题行 <= 72个字符，不以句号结尾
-    4. 正文使用现在时态解释每个变更的内容和原因
-    5. 不要遗漏任何变更
-    # 分析材料
-    {diff}
-    '''
-                platform = PlatformRegistry().get_codegen_platform()
-                commit_message = platform.chat_until_success(prompt)
-                commit_message = self._extract_commit_message(commit_message)
-                spinner.write("✅ 生成提交消息")
+                find_git_root()
+                if not has_uncommitted_changes():
+                    PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
+                    return {"success": True, "stdout": "No changes to commit", "stderr": ""}
                 
-                # 执行提交
-                spinner.text = "正在准备提交..."
-                with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
-                    tmp_file.write(commit_message)
-                    tmp_file.flush()
-                    spinner.text = "正在执行提交..."
-                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
+                    # 添加文件
+                    spinner.text = "正在添加文件到提交..."
                     subprocess.Popen(
-                        commit_cmd,
+                        ["git", "add", "."],
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
                     ).wait()
-                    spinner.write("✅ 提交")
+                    spinner.write("✅ 添加文件到提交")
+                    
+                    # 获取差异
+                    spinner.text = "正在获取代码差异..."
+                    process = subprocess.Popen(
+                        ["git", "diff", "--cached", "--exit-code"],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE
+                    )
+                    diff = process.communicate()[0].decode()
+                    spinner.write("✅ 获取差异")
+                    
+                    # 生成提交信息
+                    spinner.text = "正在生成提交消息..."
+                    prompt = f'''根据以下规则生成提交信息：
+                    提交信息应使用{args.get('lang', '中文')}书写
+        # 必需结构
+        必须使用以下格式：
+        <COMMIT_MESSAGE>
+        <类型>(<范围>): <主题>
+        使用祈使语气描述变更内容
+        </COMMIT_MESSAGE>
+        # 格式规则
+        1. 类型: fix, feat, docs, style, refactor, test, chore
+        2. 范围表示模块 (例如: auth, database)
+        3. 主题行 <= 72个字符，不以句号结尾
+        4. 正文使用现在时态解释每个变更的内容和原因
+        5. 不要遗漏任何变更
+        # 分析材料
+        {diff}
+        '''
+                    platform = PlatformRegistry().get_codegen_platform()
+                    commit_message = platform.chat_until_success(prompt)
+                    commit_message = self._extract_commit_message(commit_message)
+                    spinner.write("✅ 生成提交消息")
+                    
+                    # 执行提交
+                    spinner.text = "正在准备提交..."
+                    with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
+                        tmp_file.write(commit_message)
+                        tmp_file.flush()
+                        spinner.text = "正在执行提交..."
+                        commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                        subprocess.Popen(
+                            commit_cmd,
+                            stdout=subprocess.DEVNULL,
+                            stderr=subprocess.DEVNULL
+                        ).wait()
+                        spinner.write("✅ 提交")
 
-                commit_hash = self._get_last_commit_hash()
-                spinner.text = "完成提交"
-                spinner.ok("✅")
+                    commit_hash = self._get_last_commit_hash()
+                    spinner.text = "完成提交"
+                    spinner.ok("✅")
 
-            PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
+                PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
-            return {
-                "success": True,
-                "stdout": yaml.safe_dump({
-                    "commit_hash": commit_hash,
-                    "commit_message": commit_message
-                }),
-                "stderr": ""
-                }
+                return {
+                    "success": True,
+                    "stdout": yaml.safe_dump({
+                        "commit_hash": commit_hash,
+                        "commit_message": commit_message
+                    }),
+                    "stderr": ""
+                    }
+            finally:
+                # Always restore original directory
+                os.chdir(original_dir)
 
         except Exception as e:
             return {
@@ -140,9 +158,10 @@ def main():
     init_env()
     parser = argparse.ArgumentParser(description='Git commit tool')
     parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
+    parser.add_argument('--root-dir', type=str, default='.', help='Root directory of the Git repository')
     args = parser.parse_args()
     tool = GitCommitTool()
-    tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese'})
+    tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese', "root_dir": args.root_dir})
 
 if __name__ == "__main__":
     sys.exit(main())