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

jarvis/jarvis_smart_shell/main.py

@@ -5,8 +5,6 @@ import os
 import sys
 from typing import Optional
 
-from sympy import false
-
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_shell_name, set_config
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -20,41 +18,42 @@ def execute_command(command: str, should_run: bool) -> None:
         os.system(command)
 
 
-
-
 def install_fish_completion() -> int:
     """Install fish shell command completion with interactive choice
-    
+
     Returns:
         int: 0 if success, 1 if failed
     """
     if get_shell_name() != "fish":
         print("当前不是fish shell，无需安装")
         return 0
-        
+
     # 使用fish命令检查函数是否已加载
     check_cmd = 'functions --names | grep fish_command_not_found > /dev/null && echo "defined" || echo "undefined"'
-    result = os.popen(f'fish -c \'{check_cmd}\'').read().strip()
-    
+    result = os.popen(f"fish -c '{check_cmd}'").read().strip()
+
     if result == "defined":
         print("fish_command_not_found函数已加载，无需安装")
         return 0
-        
+
     config_file = os.path.expanduser("~/.config/fish/config.fish")
-    
+
     # 检查文件内容是否已定义但未加载
     if os.path.exists(config_file):
-        with open(config_file, 'r') as config:
+        with open(config_file, "r") as config:
             if "function fish_command_not_found" in config.read():
-                print("fish_command_not_found函数已定义但未加载，请执行: source ~/.config/fish/config.fish")
+                print(
+                    "fish_command_not_found函数已定义但未加载，请执行: source ~/.config/fish/config.fish"
+                )
                 return 0
-                
+
     # 创建config.fish文件如果不存在
     os.makedirs(os.path.dirname(config_file), exist_ok=True)
-    
+
     # 追加函数定义到config.fish
-    with open(config_file, 'a') as config:
-        config.write("""
+    with open(config_file, "a") as config:
+        config.write(
+            """
 function fish_command_not_found
     commandline -r (jss request "$argv")
 end
@@ -62,8 +61,11 @@ end
 function __fish_command_not_found_handler --on-event fish_command_not_found
     fish_command_not_found "$argv"
 end
-""")
-    print("Fish shell命令补全功能已安装到config.fish，请执行: source ~/.config/fish/config.fish")
+"""
+        )
+    print(
+        "Fish shell命令补全功能已安装到config.fish，请执行: source ~/.config/fish/config.fish"
+    )
     return 0
 
 
@@ -115,12 +117,13 @@ def process_request(request: str) -> Optional[str]:
     except Exception:
         return None
 
+
 def main() -> int:
     # 创建参数解析器
     init_env("")
 
     set_config("JARVIS_PRINT_PROMPT", "false")
-    
+
     parser = argparse.ArgumentParser(
         description="将自然语言要求转换为shell命令",
         formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -128,29 +131,30 @@ def main() -> int:
 Example:
   %(prog)s request "Find all Python files in the current directory"
   %(prog)s install
-""")
+""",
+    )
 
     # 创建子命令解析器
-    subparsers = parser.add_subparsers(dest='command', required=True)
+    subparsers = parser.add_subparsers(dest="command", required=True)
 
     # request子命令
-    request_parser = subparsers.add_parser('request', help='描述您想要执行的操作（用自然语言描述）')
+    request_parser = subparsers.add_parser(
+        "request", help="描述您想要执行的操作（用自然语言描述）"
+    )
     request_parser.add_argument(
         "request",
-        nargs='?',  # 设置为可选参数
-        help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
+        nargs="?",  # 设置为可选参数
+        help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取",
     )
 
     # install子命令
-    install_parser = subparsers.add_parser('install', help='安装fish shell的命令补全功能')
+    install_parser = subparsers.add_parser(
+        "install", help="安装fish shell的命令补全功能"
+    )
     install_parser.add_argument(
-        "--shell",
-        choices=["fish"],
-        default="fish",
-        help="指定shell类型(仅支持fish)"
+        "--shell", choices=["fish"], default="fish", help="指定shell类型(仅支持fish)"
     )
 
-
     # 解析参数
     args = parser.parse_args()
 
@@ -178,5 +182,6 @@ Example:
     else:
         return 1
 
+
 if __name__ == "__main__":
     sys.exit(main())

jarvis/jarvis_tools/ask_user.py

@@ -9,21 +9,17 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 # 定义AskUserTool类，用于向用户提问
 class AskUserTool:
-    name="ask_user"
-    description="""当完成任务所需的信息缺失或关键决策信息不足时，向用户提问。用户可以输入多行文本，以空行结束。使用场景：1. 需要用户提供更多信息以完成任务；2. 需要用户做出关键决策；3. 需要用户确认重要操作；4. 需要用户提供额外信息"""
+    name = "ask_user"
+    description = """当完成任务所需的信息缺失或关键决策信息不足时，向用户提问。用户可以输入多行文本，以空行结束。使用场景：1. 需要用户提供更多信息以完成任务；2. 需要用户做出关键决策；3. 需要用户确认重要操作；4. 需要用户提供额外信息"""
     # 定义参数结构，指定必须包含的问题字段
-    parameters={
+    parameters = {
         "type": "object",
         "properties": {
-            "question": {
-                "type": "string",
-                "description": "要向用户提出的问题"
-            }
+            "question": {"type": "string", "description": "要向用户提出的问题"}
         },
-        "required": ["question"]
+        "required": ["question"],
     }
 
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         """执行向用户提问的操作
 
@@ -48,16 +44,12 @@ class AskUserTool:
             user_response = get_multiline_input("请输入您的答案 (输入空行结束)")
 
             # 返回成功响应，包含用户输入的内容
-            return {
-                "success": True,
-                "stdout": user_response,
-                "stderr": ""
-            }
+            return {"success": True, "stdout": user_response, "stderr": ""}
 
         except Exception as e:
             # 如果发生异常，返回失败响应，包含错误信息
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"Failed to ask user: {str(e)}"
-            }
+                "stderr": f"Failed to ask user: {str(e)}",
+            }

jarvis/jarvis_tools/base.py

@@ -20,12 +20,13 @@ class Tool:
         self.description = description
         self.parameters = parameters
         self.func = func
+
     def to_dict(self) -> Dict:
         """将工具对象转换为字典格式，主要用于序列化"""
         return {
             "name": self.name,
             "description": self.description,
-            "parameters": json.dumps(self.parameters, ensure_ascii=False)
+            "parameters": json.dumps(self.parameters, ensure_ascii=False),
         }
 
     def execute(self, arguments: Dict) -> Dict[str, Any]:
@@ -38,4 +39,4 @@ class Tool:
         返回:
             Dict[str, Any]: 工具执行结果
         """
-        return self.func(arguments)
+        return self.func(arguments)

jarvis/jarvis_tools/chdir.py

@@ -11,10 +11,10 @@ class ChdirTool:
         "properties": {
             "path": {
                 "type": "string",
-                "description": "要切换到的目录路径，支持相对路径和绝对路径"
+                "description": "要切换到的目录路径，支持相对路径和绝对路径",
             }
         },
-        "required": ["path"]
+        "required": ["path"],
     }
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
@@ -44,18 +44,14 @@ class ChdirTool:
 
             # 验证目标路径是否存在
             if not os.path.exists(path):
-                return {
-                    "success": False,
-                    "stdout": "",
-                    "stderr": f"目录不存在: {path}"
-                }
+                return {"success": False, "stdout": "", "stderr": f"目录不存在: {path}"}
 
             # 确保路径指向的是目录，而不是文件
             if not os.path.isdir(path):
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": f"路径不是目录: {path}"
+                    "stderr": f"路径不是目录: {path}",
                 }
 
             # 获取当前目录并尝试切换到新路径
@@ -65,20 +61,12 @@ class ChdirTool:
             return {
                 "success": True,
                 "stdout": f"成功切换工作目录:\n原目录: {old_path}\n新目录: {path}",
-                "stderr": ""
+                "stderr": "",
             }
 
         # 处理用户没有目录访问权限的情况
         except PermissionError:
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"无权限访问目录: {path}"
-            }
+            return {"success": False, "stdout": "", "stderr": f"无权限访问目录: {path}"}
         # 捕获在目录切换过程中可能出现的其他意外错误
         except Exception as e:
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"切换目录失败: {str(e)}"
-            }
+            return {"success": False, "stdout": "", "stderr": f"切换目录失败: {str(e)}"}

jarvis/jarvis_tools/cli/main.py

@@ -1,4 +1,3 @@
-
 import sys
 
 from jarvis.jarvis_tools.registry import ToolRegistry
@@ -9,11 +8,11 @@ from jarvis.jarvis_utils.utils import init_env
 def main() -> int:
     """
     命令行工具入口，提供工具列表查看和工具调用功能
-    
+
     功能:
         1. 列出所有可用工具 (list命令)
         2. 调用指定工具 (call命令)
-    
+
     参数:
         通过命令行参数传递，包括:
         - list: 列出工具
@@ -23,7 +22,7 @@ def main() -> int:
             tool_name: 工具名称
             --args: 工具参数(JSON格式)
             --args-file: 从文件加载工具参数
-    
+
     返回值:
         int: 0表示成功，非0表示错误
     """
@@ -62,7 +61,9 @@ def main() -> int:
 
         if args.json:
             if args.detailed:
-                print(json.dumps(tools, indent=2, ensure_ascii=False))  # 输出完整JSON格式
+                print(
+                    json.dumps(tools, indent=2, ensure_ascii=False)
+                )  # 输出完整JSON格式
             else:
                 simple_tools = [
                     {"name": t["name"], "description": t["description"]} for t in tools
@@ -79,25 +80,28 @@ def main() -> int:
 
     elif args.command == "stat":
         from tabulate import tabulate
+
         stats = registry._get_tool_stats()
         tools = registry.get_all_tools()
-        
+
         # 构建统计表格数据
         table_data = []
         for tool in tools:
             name = tool["name"]
             count = stats.get(name, 0)
             table_data.append([name, count])
-        
+
         # 按调用次数降序排序
         table_data.sort(key=lambda x: x[1], reverse=True)
-        
+
         if args.json:
             print(json.dumps(dict(table_data), indent=2))
         else:
             PrettyOutput.section("工具调用统计", OutputType.SYSTEM)
-            print(tabulate(table_data, headers=["工具名称", "调用次数"], tablefmt="grid"))
-            
+            print(
+                tabulate(table_data, headers=["工具名称", "调用次数"], tablefmt="grid")
+            )
+
         return 0
 
     elif args.command == "call":

jarvis/jarvis_tools/code_plan.py

@@ -40,17 +40,14 @@ class CodePlanTool:
     parameters = {
         "type": "object",
         "properties": {
-            "requirement": {
-                "type": "string",
-                "description": "代码修改需求描述"
-            },
+            "requirement": {"type": "string", "description": "代码修改需求描述"},
             "root_dir": {
                 "type": "string",
                 "description": "代码库根目录路径（可选）",
-                "default": "."
-            }
+                "default": ".",
+            },
         },
-        "required": ["requirement"]
+        "required": ["requirement"],
     }
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
@@ -89,12 +86,9 @@ class CodePlanTool:
 
                 # 创建工具注册表
                 tool_registry: ToolRegistry = ToolRegistry()
-                tool_registry.use_tools([
-                    "execute_script", 
-                    "read_code", 
-                    "search_web", 
-                    "ask_user"
-                ])
+                tool_registry.use_tools(
+                    ["execute_script", "read_code", "search_web", "ask_user"]
+                )
 
                 # 创建并运行Agent
                 platform_registry: PlatformRegistry = PlatformRegistry()
@@ -113,30 +107,18 @@ class CodePlanTool:
                 task_input = f"分析并规划代码修改: {requirement}"
                 result = planner_agent.run(task_input)
 
-                return {
-                    "success": True,
-                    "stdout": result,
-                    "stderr": ""
-                }
+                return {"success": True, "stdout": result, "stderr": ""}
             except (OSError, RuntimeError) as e:
                 error_msg = f"代码规划失败: {str(e)}"
                 PrettyOutput.print(error_msg, OutputType.WARNING)
-                return {
-                    "success": False,
-                    "stdout": "",
-                    "stderr": error_msg
-                }
+                return {"success": False, "stdout": "", "stderr": error_msg}
             finally:
                 # 恢复原始目录
                 os.chdir(original_dir)
         except (KeyError, ValueError) as e:
             error_msg = f"代码规划失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.WARNING)
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": error_msg
-            }
+            return {"success": False, "stdout": "", "stderr": error_msg}
 
     def _create_system_prompt(self, requirement: str, git_root: str) -> str:
         """创建Agent的system prompt"""
@@ -234,6 +216,3 @@ class CodePlanTool:
    - 记录用户的任何特殊要求
 
 使用清晰的Markdown格式，重点突出修改计划和验证方案。"""
-
-
-

jarvis/jarvis_tools/create_code_agent.py

@@ -25,11 +25,10 @@ class CreateCodeAgentTool:
         "root_dir": {
             "type": "string",
             "description": "代码库根目录路径（可选）",
-            "default": "."
-        }
+            "default": ".",
+        },
     }
 
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             requirement = args.get("requirement", "")
@@ -45,7 +44,7 @@ class CreateCodeAgentTool:
                     return {
                         "success": False,
                         "stderr": "Requirement must be provided",
-                        "stdout": ""
+                        "stdout": "",
                     }
 
                 # Step 1: Handle uncommitted changes
@@ -58,7 +57,7 @@ class CreateCodeAgentTool:
                         return {
                             "success": False,
                             "stderr": "Failed to commit changes: " + result["stderr"],
-                            "stdout": ""
+                            "stdout": "",
                         }
 
                 # Get current commit hash
@@ -83,11 +82,7 @@ class CreateCodeAgentTool:
 
 """
 
-                return {
-                    "success": True,
-                    "stdout": summary,
-                    "stderr": ""
-                }
+                return {"success": True, "stdout": summary, "stderr": ""}
             finally:
                 # Always restore original directory
                 os.chdir(original_dir)
@@ -96,5 +91,5 @@ class CreateCodeAgentTool:
             return {
                 "success": False,
                 "stderr": f"Development workflow failed: {str(e)}",
-                "stdout": ""
+                "stdout": "",
             }

jarvis/jarvis_tools/create_sub_agent.py

@@ -12,34 +12,23 @@ class SubAgentTool:
     parameters = {
         "type": "object",
         "properties": {
-            "agent_name": {
-                "type": "string",
-                "description": "子代理名称"
-            },
-            "task": {
-                "type": "string",
-                "description": "要完成的特定任务"
-            },
+            "agent_name": {"type": "string", "description": "子代理名称"},
+            "task": {"type": "string", "description": "要完成的特定任务"},
             "context": {
                 "type": "string",
                 "description": "与任务相关的上下文信息",
-                "default": ""
-            },
-            "goal": {
-                "type": "string",
-                "description": "任务的完成目标",
-                "default": ""
+                "default": "",
             },
+            "goal": {"type": "string", "description": "任务的完成目标", "default": ""},
             "root_dir": {
                 "type": "string",
                 "description": "任务执行的根目录路径（可选）",
-                "default": "."
-            }
+                "default": ".",
+            },
         },
-        "required": ["agent_name", "task"]
+        "required": ["agent_name", "task"],
     }
 
-
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Create and run sub-agent"""
         try:
@@ -58,7 +47,6 @@ class SubAgentTool:
             if goal:
                 task_description += f"\n\nCompletion goal:\n{goal}"
 
-
             # Store current directory
             original_dir = os.getcwd()
 
@@ -79,7 +67,7 @@ class SubAgentTool:
                 return {
                     "success": True,
                     "stdout": f"Sub-agent task completed\n\n{result}",
-                    "stderr": ""
+                    "stderr": "",
                 }
             finally:
                 # Always restore original directory
@@ -90,5 +78,5 @@ class SubAgentTool:
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"Sub-agent execution failed: {str(e)}"
-            }
+                "stderr": f"Sub-agent execution failed: {str(e)}",
+            }