jarvis-ai-assistant 0.1.193__py3-none-any.whl → 0.1.195__py3-none-any.whl

jarvis/jarvis_dev/main.py

@@ -950,74 +950,87 @@ content: |2
 </quality_assurance_guide>
 """
 
+
 def create_dev_team() -> MultiAgent:
     """Create a development team with multiple agents."""
 
     PM_output_handler = ToolRegistry()
-    PM_output_handler.use_tools([
-        "ask_user",
-        "file_operation",
-        "search_web",
-        "execute_script",
-        "methodology",
-        "edit_file",
-        "rewrite_file",
-    ])
+    PM_output_handler.use_tools(
+        [
+            "ask_user",
+            "file_operation",
+            "search_web",
+            "execute_script",
+            "methodology",
+            "edit_file",
+            "rewrite_file",
+        ]
+    )
 
     BA_output_handler = ToolRegistry()
-    BA_output_handler.use_tools([
-        "ask_user",
-        "file_operation",
-        "search_web",
-        "execute_script",
-        "read_webpage",
-        "methodology",
-        "edit_file",
-        "rewrite_file",
-    ])
+    BA_output_handler.use_tools(
+        [
+            "ask_user",
+            "file_operation",
+            "search_web",
+            "execute_script",
+            "read_webpage",
+            "methodology",
+            "edit_file",
+            "rewrite_file",
+        ]
+    )
 
     SA_output_handler = ToolRegistry()
-    SA_output_handler.use_tools([
-        "file_operation",
-        "search_web",
-        "execute_script",
-        "read_code",
-        "methodology",
-        "edit_file",
-        "rewrite_file",
-    ])
+    SA_output_handler.use_tools(
+        [
+            "file_operation",
+            "search_web",
+            "execute_script",
+            "read_code",
+            "methodology",
+            "edit_file",
+            "rewrite_file",
+        ]
+    )
 
     TL_output_handler = ToolRegistry()
-    TL_output_handler.use_tools([
-        "file_operation",
-        "execute_script",
-        "methodology",
-        "edit_file",
-        "rewrite_file",
-    ])
+    TL_output_handler.use_tools(
+        [
+            "file_operation",
+            "execute_script",
+            "methodology",
+            "edit_file",
+            "rewrite_file",
+        ]
+    )
 
     DEV_output_handler = ToolRegistry()
-    DEV_output_handler.use_tools([
-        "create_code_agent",
-        "file_operation",
-        "execute_script",
-        "read_code",
-        "create_sub_agent",
-        "methodology",
-        "edit_file",
-        "rewrite_file",
-    ])
+    DEV_output_handler.use_tools(
+        [
+            "create_code_agent",
+            "file_operation",
+            "execute_script",
+            "read_code",
+            "create_sub_agent",
+            "methodology",
+            "edit_file",
+            "rewrite_file",
+        ]
+    )
 
     QA_output_handler = ToolRegistry()
-    QA_output_handler.use_tools([
-        "create_code_agent",
-        "file_operation",
-        "execute_script",
-        "read_code",
-        "methodology",
-        "edit_file",
-        "rewrite_file",
-    ])
+    QA_output_handler.use_tools(
+        [
+            "create_code_agent",
+            "file_operation",
+            "execute_script",
+            "read_code",
+            "methodology",
+            "edit_file",
+            "rewrite_file",
+        ]
+    )
 
     # Update PM prompt with tool usage guidance
     PM_PROMPT_EXTENSION = """
@@ -1196,11 +1209,12 @@ def create_dev_team() -> MultiAgent:
             system_prompt=QA_PROMPT_WITH_TOOLS,
             output_handler=[QA_output_handler],
             platform=PlatformRegistry().get_normal_platform(),
-        )
+        ),
     ]
 
     return MultiAgent(configs, "PM")
 
+
 def main():
     """Main entry point for the development team simulation."""
 
@@ -1212,7 +1226,9 @@ def main():
     # Start interaction loop
     while True:
         try:
-            user_input = get_multiline_input("\nEnter your request (or press Enter to exit): ")
+            user_input = get_multiline_input(
+                "\nEnter your request (or press Enter to exit): "
+            )
             if not user_input:
                 break
 
@@ -1226,5 +1242,6 @@ def main():
             PrettyOutput.print(f"Error: {str(e)}", output_type=OutputType.SYSTEM)
             continue
 
+
 if __name__ == "__main__":
     main()

jarvis/jarvis_git_details/main.py

@@ -54,7 +54,7 @@ class GitCommitAnalyzer:
             return {
                 "success": False,
                 "stdout": {},
-                "stderr": f"Failed to analyze commit: {str(e)}"
+                "stderr": f"Failed to analyze commit: {str(e)}",
             }
 
     def analyze_single_commit(self, commit_sha: str, root_dir: str) -> Dict[str, Any]:
@@ -73,16 +73,12 @@ class GitCommitAnalyzer:
 
             # 获取commit详细信息
             commit_info = subprocess.check_output(
-                f"git show {commit_sha} --pretty=fuller",
-                shell=True,
-                text=True
+                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
+                f"git show {commit_sha} --patch", shell=True, text=True
             )
 
             # 分析commit的功能、原因和逻辑
@@ -93,15 +89,15 @@ class GitCommitAnalyzer:
                 "stdout": {
                     "commit_info": commit_info,
                     "diff_content": diff_content,
-                    "analysis_result": analysis_result
+                    "analysis_result": analysis_result,
                 },
-                "stderr": ""
+                "stderr": "",
             }
         except subprocess.CalledProcessError as error:
             return {
                 "success": False,
                 "stdout": {},
-                "stderr": f"Failed to analyze commit: {str(error)}"
+                "stderr": f"Failed to analyze commit: {str(error)}",
             }
         finally:
             os.chdir(original_dir)
@@ -122,16 +118,12 @@ class GitCommitAnalyzer:
 
             # 获取commit范围差异
             diff_content = subprocess.check_output(
-                f"git diff {commit_range} --patch",
-                shell=True,
-                text=True
+                f"git diff {commit_range} --patch", shell=True, text=True
             )
 
             # 获取commit范围信息
             commit_info = subprocess.check_output(
-                f"git log {commit_range} --pretty=fuller",
-                shell=True,
-                text=True
+                f"git log {commit_range} --pretty=fuller", shell=True, text=True
             )
 
             # 使用相同的分析方法处理差异内容
@@ -142,15 +134,15 @@ class GitCommitAnalyzer:
                 "stdout": {
                     "commit_info": commit_info,
                     "diff_content": diff_content,
-                    "analysis_result": analysis_result
+                    "analysis_result": analysis_result,
                 },
-                "stderr": ""
+                "stderr": "",
             }
         except subprocess.CalledProcessError as error:
             return {
                 "success": False,
                 "stdout": {},
-                "stderr": f"Failed to analyze commit range: {str(error)}"
+                "stderr": f"Failed to analyze commit range: {str(error)}",
             }
         finally:
             os.chdir(original_dir)
@@ -208,7 +200,7 @@ class GitCommitAnalyzer:
 {ct("REPORT")}""",
             output_handler=[tool_registry],
             platform=PlatformRegistry().get_normal_platform(),
-            auto_complete=True
+            auto_complete=True,
         )
 
         return agent.run(diff_content)
@@ -223,7 +215,9 @@ def extract_analysis_report(result: str) -> str:
     Returns:
         提取的报告内容，如果未找到REPORT标签则返回空字符串
     """
-    search_match = re.search(ot("REPORT")+r'\n(.*?)\n'+ct("REPORT"), result, re.DOTALL)
+    search_match = re.search(
+        ot("REPORT") + r"\n(.*?)\n" + ct("REPORT"), result, re.DOTALL
+    )
     if search_match:
         return search_match.group(1)
     return result
@@ -235,25 +229,27 @@ def main():
 
     init_env("欢迎使用 Jarvis-GitCommitAnalyzer，您的Git Commit分析助手已准备就绪！")
 
-    parser = argparse.ArgumentParser(description='Git Commit Analyzer')
+    parser = argparse.ArgumentParser(description="Git Commit Analyzer")
     group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument('commit', nargs='?', help='Commit SHA to analyze')
-    group.add_argument('--range', type=str, help='Commit range to analyze (commit1..commit2)')
-    parser.add_argument('--root-dir', type=str, help='Root directory of the codebase', default=".")
+    group.add_argument("commit", nargs="?", help="Commit SHA to analyze")
+    group.add_argument(
+        "--range", type=str, help="Commit range to analyze (commit1..commit2)"
+    )
+    parser.add_argument(
+        "--root-dir", type=str, help="Root directory of the codebase", default="."
+    )
 
     args = parser.parse_args()
 
     analyzer = GitCommitAnalyzer()
     if args.range:
-        result = analyzer.execute({
-            "commit_range": args.range,
-            "root_dir": args.root_dir
-        })
+        result = analyzer.execute(
+            {"commit_range": args.range, "root_dir": args.root_dir}
+        )
     else:
-        result = analyzer.execute({
-            "commit_sha": args.commit,
-            "root_dir": args.root_dir
-        })
+        result = analyzer.execute(
+            {"commit_sha": args.commit, "root_dir": args.root_dir}
+        )
 
     if result["success"]:
         PrettyOutput.section("Commit Information:", OutputType.SUCCESS)

jarvis/jarvis_git_squash/main.py

@@ -12,7 +12,7 @@ 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"
-    labels = ['git', 'version_control', 'squash']
+    labels = ["git", "version_control", "squash"]
 
     def _confirm_squash(self) -> bool:
         """Prompt user for confirmation to squash commits"""
@@ -24,7 +24,7 @@ class GitSquashTool:
             subprocess.Popen(
                 ["git", "reset", "--mixed", commit_hash],
                 stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL
+                stderr=subprocess.DEVNULL,
             ).wait()
             return True
         except Exception:
@@ -37,27 +37,29 @@ class GitSquashTool:
                 PrettyOutput.print("操作已取消", OutputType.WARNING)
                 return
 
-            if not self._reset_to_commit(args['commit_hash']):
+            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')})
+            commit_tool.execute({"lang": args.get("lang", "Chinese")})
         except Exception as e:
             PrettyOutput.print(f"压缩提交失败: {str(e)}", OutputType.WARNING)
 
+
 def main():
     init_env("欢迎使用 Jarvis-GitSquash，您的Git压缩助手已准备就绪！")
-    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')
+    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,
-        'lang': args.lang
-    })
+    tool.execute({"commit_hash": args.commit_hash, "lang": args.lang})
+
+
 if __name__ == "__main__":
     sys.exit(main())

jarvis/jarvis_git_utils/git_commiter.py

@@ -12,7 +12,8 @@ from yaspin import yaspin
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_git_commit_prompt
-from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
+from jarvis.jarvis_utils.git_utils import (find_git_root,
+                                           has_uncommitted_changes)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
@@ -30,8 +31,16 @@ class GitCommitTool:
                 "description": "Git仓库的根目录路径（可选）",
                 "default": ".",
             },
-            "prefix": {"type": "string", "description": "提交信息前缀（可选）", "default": ""},
-            "suffix": {"type": "string", "description": "提交信息后缀（可选）", "default": ""},
+            "prefix": {
+                "type": "string",
+                "description": "提交信息前缀（可选）",
+                "default": "",
+            },
+            "suffix": {
+                "type": "string",
+                "description": "提交信息后缀（可选）",
+                "default": "",
+            },
         },
         "required": [],
     }
@@ -109,7 +118,7 @@ class GitCommitTool:
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
                 )
-                diff = process.communicate()[0].decode()
+                diff = process.communicate()[0].decode(errors="ignore")
                 spinner.write(f"✅ 获取差异 ({file_count} 个文件)")
                 try:
                     temp_diff_file_path = None
@@ -265,7 +274,8 @@ commit信息
                             spinner.write(f"⚠️ 无法删除临时文件: {str(e)}")
 
             PrettyOutput.print(
-                f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS
+                f"提交哈希: {commit_hash}\n提交消息: {commit_message}",
+                OutputType.SUCCESS,
             )
 
             return {

jarvis/jarvis_mcp/__init__.py

@@ -5,11 +5,11 @@ from typing import Any, Dict, List
 
 class McpClient(ABC):
     """MCP客户端抽象基类"""
-    
+
     @abstractmethod
     def get_tool_list(self) -> List[Dict[str, Any]]:
         """获取工具列表
-        
+
         返回:
             List[Dict[str, Any]]: 工具列表，每个工具包含以下字段：
                 - name: str - 工具名称
@@ -17,15 +17,15 @@ class McpClient(ABC):
                 - parameters: Dict - 工具参数
         """
         pass
-    
+
     @abstractmethod
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
         """执行工具
-        
+
         参数:
             tool_name: 工具名称
             arguments: 参数字典，包含工具执行所需的参数
-            
+
         返回:
             Dict[str, Any]: 执行结果，包含以下字段：
                 - success: bool - 是否执行成功
@@ -37,7 +37,7 @@ class McpClient(ABC):
     @abstractmethod
     def get_resource_list(self) -> List[Dict[str, Any]]:
         """获取资源列表
-        
+
         返回:
             List[Dict[str, Any]]: 资源列表，每个资源包含以下字段：
                 - uri: str - 资源的唯一标识符
@@ -50,10 +50,10 @@ class McpClient(ABC):
     @abstractmethod
     def get_resource(self, uri: str) -> Dict[str, Any]:
         """获取指定资源的内容
-        
+
         参数:
             uri: str - 资源的URI标识符
-            
+
         返回:
             Dict[str, Any]: 资源内容，包含以下字段：
                 - uri: str - 资源的URI
@@ -62,5 +62,3 @@ class McpClient(ABC):
                 - blob: str - 二进制内容（如果是二进制资源，base64编码）
         """
         pass
-
-