jarvis-ai-assistant 0.1.222__py3-none-any.whl → 0.7.0__py3-none-any.whl

jarvis/jarvis_smart_shell/main.py

@@ -1,14 +1,24 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import argparse
 import os
-import sys
 from typing import Optional, Tuple
 
+import typer
+
 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
 from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+app = typer.Typer(
+    help="将自然语言要求转换为shell命令",
+    epilog="""
+Example:
+  jss request "Find all Python files in the current directory"
+  jss install
+""",
+)
 
 
 def execute_command(command: str, should_run: bool) -> None:
@@ -18,59 +28,121 @@ def execute_command(command: str, should_run: bool) -> None:
         os.system(command)
 
 
-def _check_fish_shell() -> bool:
-    """Check if current shell is fish
-    
-    Returns:
-        bool: True if fish shell, False otherwise
-    """
-    return get_shell_name() == "fish"
-
 def _get_config_file() -> str:
     """Get fish config file path
-    
+
     Returns:
         str: Path to fish config file
     """
     return os.path.expanduser("~/.config/fish/config.fish")
 
+
 def _get_markers() -> Tuple[str, str]:
     """Get start and end markers for JSS completion
-    
+
     Returns:
         Tuple[str, str]: (start_marker, end_marker)
     """
     return (
         "# ===== JARVIS JSS FISH COMPLETION START =====",
-        "# ===== JARVIS JSS FISH COMPLETION END ====="
+        "# ===== JARVIS JSS FISH COMPLETION END =====",
+    )
+
+
+def _check_bash_shell() -> bool:
+    """Check if current shell is bash
+
+    Returns:
+        bool: True if bash shell, False otherwise
+    """
+    return get_shell_name() == "bash"
+
+
+def _get_bash_config_file() -> str:
+    """Get bash config file path
+
+    Returns:
+        str: Path to bash config file (~/.bashrc)
+    """
+    return os.path.expanduser("~/.bashrc")
+
+
+def _get_bash_markers() -> Tuple[str, str]:
+    """Get start and end markers for JSS completion in bash
+
+    Returns:
+        Tuple[str, str]: (start_marker, end_marker)
+    """
+    return (
+        "# ===== JARVIS JSS BASH COMPLETION START =====",
+        "# ===== JARVIS JSS BASH COMPLETION END =====",
     )
 
-def install_jss_completion() -> int:
-    """Install JSS fish shell command completion
-    
+
+def _check_zsh_shell() -> bool:
+    """Check if current shell is zsh
+
     Returns:
-        int: 0 if success, 1 if failed
+        bool: True if zsh shell, False otherwise
     """
-    if not _check_fish_shell():
-        print("当前不是fish shell，无需安装")
-        return 0
+    return get_shell_name() == "zsh"
 
-    config_file = _get_config_file()
-    start_marker, end_marker = _get_markers()
 
-    if not os.path.exists(config_file):
-        print("未找到config.fish文件，将创建新文件")
-        os.makedirs(os.path.dirname(config_file), exist_ok=True)
+def _get_zsh_config_file() -> str:
+    """Get zsh config file path
 
-    with open(config_file, "r") as f:
-        content = f.read()
+    Returns:
+        str: Path to zsh config file (~/.zshrc)
+    """
+    return os.path.expanduser("~/.zshrc")
 
-    if start_marker in content:
-        print("JSS fish completion已安装，请执行: source ~/.config/fish/config.fish")
-        return 0
 
-    with open(config_file, "a") as f:
-        f.write(f"""
+def _get_zsh_markers() -> Tuple[str, str]:
+    """Get start and end markers for JSS completion in zsh
+
+    Returns:
+        Tuple[str, str]: (start_marker, end_marker)
+    """
+    return (
+        "# ===== JARVIS JSS ZSH COMPLETION START =====",
+        "# ===== JARVIS JSS ZSH COMPLETION END =====",
+    )
+
+
+@app.command("install")
+def install_jss_completion(
+    shell: str = typer.Option("fish", help="指定shell类型(支持fish, bash, zsh)"),
+) -> None:
+    """为指定的shell安装'命令未找到'处理器，实现自然语言命令建议"""
+    if shell not in ("fish", "bash", "zsh"):
+        PrettyOutput.print(
+            f"错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh", OutputType.ERROR
+        )
+        raise typer.Exit(code=1)
+
+    if shell == "fish":
+        config_file = _get_config_file()
+        start_marker, end_marker = _get_markers()
+
+        if not os.path.exists(config_file):
+            PrettyOutput.print("未找到 config.fish 文件，将创建新文件", OutputType.INFO)
+            os.makedirs(os.path.dirname(config_file), exist_ok=True)
+            with open(config_file, "w") as f:
+                f.write("")
+
+        with open(config_file, "r") as f:
+            content = f.read()
+
+        if start_marker in content:
+            PrettyOutput.print(
+                "JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish",
+                OutputType.SUCCESS,
+            )
+            return
+
+        with open(config_file, "a") as f:
+            f.write(
+                f"""
 {start_marker}
 function fish_command_not_found
     if test (string length "$argv") -lt 10
@@ -83,41 +155,282 @@ function __fish_command_not_found_handler --on-event fish_command_not_found
     fish_command_not_found "$argv"
 end
 {end_marker}
-""")
-    print("JSS fish completion已安装，请执行: source ~/.config/fish/config.fish")
-    return 0
-
-def uninstall_jss_completion() -> int:
-    """Uninstall JSS fish shell command completion
-    
-    Returns:
-        int: 0 if success, 1 if failed
-    """
-    if not _check_fish_shell():
-        print("当前不是fish shell，无需卸载")
-        return 0
-
-    config_file = _get_config_file()
-    start_marker, end_marker = _get_markers()
-
-    if not os.path.exists(config_file):
-        print("未找到JSS fish completion配置，无需卸载")
-        return 0
-
-    with open(config_file, "r") as f:
-        content = f.read()
-
-    if start_marker not in content:
-        print("未找到JSS fish completion配置，无需卸载")
-        return 0
+"""
+            )
+        PrettyOutput.print(
+            "JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish",
+            OutputType.SUCCESS,
+        )
+    elif shell == "bash":
+        config_file = _get_bash_config_file()
+        start_marker, end_marker = _get_bash_markers()
+
+        if not os.path.exists(config_file):
+            PrettyOutput.print("未找到 ~/.bashrc 文件，将创建新文件", OutputType.INFO)
+            os.makedirs(os.path.dirname(config_file), exist_ok=True)
+            with open(config_file, "w") as f:
+                f.write("")
+
+        with open(config_file, "r") as f:
+            content = f.read()
+
+        if start_marker in content:
+            PrettyOutput.print(
+                "JSS bash completion 已安装，请执行: source ~/.bashrc",
+                OutputType.SUCCESS,
+            )
+            return
+        else:
+            with open(config_file, "a") as f:
+                f.write(
+                    f"""
+{start_marker}
+# Bash 'command not found' handler for JSS
+# 行为：
+# - 生成可编辑的建议命令，用户可直接编辑后回车执行
+# - 非交互模式下仅打印建议
+command_not_found_handle() {{
+    local cmd="$1"
+    shift || true
+    local text="$cmd $*"
+
+    # 与 fish 行为保持一致：对过短输入不处理
+    if [ ${{#text}} -lt 10 ]; then
+        return 127
+    fi
+
+    local suggestion edited
+    suggestion=$(jss request "$text")
+    if [ -n "$suggestion" ]; then
+        # 交互式：用 readline 预填命令，用户可直接回车执行或编辑
+        if [[ $- == *i* ]]; then
+            edited="$suggestion"
+            # -e 启用 readline；-i 预填默认值；无提示前缀，使体验更接近 fish 的“替换命令行”
+            read -e -i "$edited" edited
+            if [ -n "$edited" ]; then
+                eval "$edited"
+                return $?
+            fi
+        else
+            # 非交互：仅打印建议
+            printf '%s\n' "$suggestion"
+        fi
+    fi
+    return 127
+}}
+{end_marker}
+"""
+                )
+            PrettyOutput.print(
+                "JSS bash completion 已安装，请执行: source ~/.bashrc",
+                OutputType.SUCCESS,
+            )
+    elif shell == "zsh":
+        config_file = _get_zsh_config_file()
+        start_marker, end_marker = _get_zsh_markers()
+
+        if not os.path.exists(config_file):
+            PrettyOutput.print("未找到 ~/.zshrc 文件，将创建新文件", OutputType.INFO)
+            os.makedirs(os.path.dirname(config_file), exist_ok=True)
+            with open(config_file, "w") as f:
+                f.write("")
+
+        with open(config_file, "r") as f:
+            content = f.read()
+
+        if start_marker in content:
+            PrettyOutput.print(
+                "JSS zsh completion 已安装，请执行: source ~/.zshrc", OutputType.SUCCESS
+            )
+            return
+
+        with open(config_file, "a") as f:
+            f.write(
+                f"""
+{start_marker}
+# Zsh 'command not found' handler for JSS
+# 行为：
+# - 生成可编辑的建议命令，用户可直接编辑后回车执行
+# - 非交互模式下仅打印建议
+command_not_found_handler() {{
+    local cmd="$1"
+    shift || true
+    local text="$cmd $*"
+
+    # 与 fish 行为保持一致：对过短输入不处理
+    if [ ${{#text}} -lt 10 ]; then
+        return 127
+    fi
+
+    local suggestion edited
+    suggestion=$(jss request "$text")
+    if [ -n "$suggestion" ]; then
+        if [[ -o interactive ]]; then
+            local editor="${{VISUAL:-${{EDITOR:-vi}}}}"
+            local tmpfile edited
+            tmpfile="$(mktemp -t jss-edit-XXXXXX)"
+            printf '%s\n' "$suggestion" > "$tmpfile"
+            "$editor" "$tmpfile"
+            edited="$(sed -n '/./{{p;q;}}' "$tmpfile" | tr -d '\r')"
+            rm -f "$tmpfile"
+            if [ -z "$edited" ]; then
+                edited="$suggestion"
+            fi
+            eval "$edited"
+            return $?
+        else
+            # 非交互：仅打印建议
+            print -r -- "$suggestion"
+        fi
+    fi
+    return 127
+}}
+{end_marker}
+"""
+            )
+        PrettyOutput.print(
+            "JSS zsh completion 已安装，请执行: source ~/.zshrc", OutputType.SUCCESS
+        )
+        return
 
-    new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
-    
-    with open(config_file, "w") as f:
-        f.write(new_content)
-    
-    print("JSS fish completion已卸载，请执行: source ~/.config/fish/config.fish")
-    return 0
+        with open(config_file, "a") as f:
+            f.write(
+                f"""
+{start_marker}
+# Bash 'command not found' handler for JSS
+# 行为：
+# - 生成可编辑的建议命令，用户可直接编辑后回车执行
+# - 非交互模式下仅打印建议
+command_not_found_handle() {{
+    local cmd="$1"
+    shift || true
+    local text="$cmd $*"
+
+    # 与 fish 行为保持一致：对过短输入不处理
+    if [ ${{#text}} -lt 10 ]; then
+        return 127
+    fi
+
+    local suggestion edited
+    suggestion=$(jss request "$text")
+    if [ -n "$suggestion" ]; then
+        # 交互式：用 readline 预填命令，用户可直接回车执行或编辑
+        if [[ $- == *i* ]]; then
+            edited="$suggestion"
+            # -e 启用 readline；-i 预填默认值；无提示前缀，使体验更接近 fish 的“替换命令行”
+            read -e -i "$edited" edited
+            if [ -n "$edited" ]; then
+                eval "$edited"
+                return $?
+            fi
+        else
+            # 非交互：仅打印建议
+            printf '%s\n' "$suggestion"
+        fi
+    fi
+    return 127
+}}
+{end_marker}
+"""
+            )
+        PrettyOutput.print(
+            "JSS bash completion 已安装，请执行: source ~/.bashrc", OutputType.SUCCESS
+        )
+
+
+@app.command("uninstall")
+def uninstall_jss_completion(
+    shell: str = typer.Option("fish", help="指定shell类型(支持fish, bash, zsh)"),
+) -> None:
+    """卸载JSS shell'命令未找到'处理器"""
+    if shell not in ("fish", "bash", "zsh"):
+        PrettyOutput.print(
+            f"错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh", OutputType.ERROR
+        )
+        raise typer.Exit(code=1)
+
+    if shell == "fish":
+        config_file = _get_config_file()
+        start_marker, end_marker = _get_markers()
+
+        if not os.path.exists(config_file):
+            PrettyOutput.print(
+                "未找到 JSS fish completion 配置，无需卸载", OutputType.INFO
+            )
+            return
+
+        with open(config_file, "r") as f:
+            content = f.read()
+
+        if start_marker not in content:
+            PrettyOutput.print(
+                "未找到 JSS fish completion 配置，无需卸载", OutputType.INFO
+            )
+            return
+
+        new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
+
+        with open(config_file, "w") as f:
+            f.write(new_content)
+
+        PrettyOutput.print(
+            "JSS fish completion 已卸载，请执行: source ~/.config/fish/config.fish",
+            OutputType.SUCCESS,
+        )
+    elif shell == "bash":
+        config_file = _get_bash_config_file()
+        start_marker, end_marker = _get_bash_markers()
+
+        if not os.path.exists(config_file):
+            PrettyOutput.print(
+                "未找到 JSS bash completion 配置，无需卸载", OutputType.INFO
+            )
+            return
+
+        with open(config_file, "r") as f:
+            content = f.read()
+
+        if start_marker not in content:
+            PrettyOutput.print(
+                "未找到 JSS bash completion 配置，无需卸载", OutputType.INFO
+            )
+            return
+
+        new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
+
+        with open(config_file, "w") as f:
+            f.write(new_content)
+
+        PrettyOutput.print(
+            "JSS bash completion 已卸载，请执行: source ~/.bashrc", OutputType.SUCCESS
+        )
+    elif shell == "zsh":
+        config_file = _get_zsh_config_file()
+        start_marker, end_marker = _get_zsh_markers()
+
+        if not os.path.exists(config_file):
+            PrettyOutput.print(
+                "未找到 JSS zsh completion 配置，无需卸载", OutputType.INFO
+            )
+            return
+
+        with open(config_file, "r") as f:
+            content = f.read()
+
+        if start_marker not in content:
+            PrettyOutput.print(
+                "未找到 JSS zsh completion 配置，无需卸载", OutputType.INFO
+            )
+            return
+
+        new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
+
+        with open(config_file, "w") as f:
+            f.write(new_content)
+
+        PrettyOutput.print(
+            "JSS zsh completion 已卸载，请执行: source ~/.zshrc", OutputType.SUCCESS
+        )
 
 
 def process_request(request: str) -> Optional[str]:
@@ -148,8 +461,8 @@ def process_request(request: str) -> Optional[str]:
 4. 多个命令用&&连接
 
 # 示例
-输入: "查找Python文件"
-输出: find . -name "*.py"
+输入: "显示当前目录内容"
+输出: ls -la
 """
         model.set_system_prompt(system_message)
 
@@ -169,85 +482,40 @@ def process_request(request: str) -> Optional[str]:
         return None
 
 
-def main() -> int:
-    # 创建参数解析器
-    init_env("")
-
-    set_config("JARVIS_PRINT_PROMPT", "false")
-
-    parser = argparse.ArgumentParser(
-        description="将自然语言要求转换为shell命令",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
-Example:
-  %(prog)s request "Find all Python files in the current directory"
-  %(prog)s install
-""",
-    )
-
-    # 创建子命令解析器
-    subparsers = parser.add_subparsers(dest="command", required=True)
-
-    # request子命令
-    request_parser = subparsers.add_parser(
-        "request", help="描述您想要执行的操作（用自然语言描述）"
-    )
-    request_parser.add_argument(
-        "request",
-        nargs="?",  # 设置为可选参数
-        help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取",
-    )
-
-    # install子命令
-    install_parser = subparsers.add_parser(
-        "install", help="安装JSS fish shell命令补全功能"
-    )
-    install_parser.add_argument(
-        "--shell", choices=["fish"], default="fish", help="指定shell类型(仅支持fish)"
-    )
-    
-    # 添加uninstall子命令
-    uninstall_parser = subparsers.add_parser(
-        "uninstall", help="卸载JSS fish shell命令补全功能"
-    )
-    uninstall_parser.add_argument(
-        "--shell", choices=["fish"], default="fish", help="指定shell类型(仅支持fish)"
+@app.command("request")
+def request_command(
+    request: Optional[str] = typer.Argument(
+        None, help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
     )
-
-    # 解析参数
-    args = parser.parse_args()
-
+):
+    """描述您想要执行的操作（用自然语言描述）"""
     should_run = False
-
-    # 处理install命令
-    if args.command == "install":
-        if args.shell != "fish":
-            print(f"错误: 不支持的shell类型: {args.shell}, 仅支持fish")
-            return 1
-        return install_jss_completion()
-
-    # 处理uninstall命令
-    if args.command == "uninstall":
-        if args.shell != "fish":
-            print(f"错误: 不支持的shell类型: {args.shell}, 仅支持fish")
-            return 1
-        return uninstall_jss_completion()
-        
-    # 处理request命令
-    if not args.request:
+    if not request:
         # 检查是否在交互式终端中运行
-        args.request = get_multiline_input(tip="请输入您要执行的功能：")
+        request = get_multiline_input(tip="请输入您要执行的功能：")
         should_run = True
+
     # 处理请求
-    command = process_request(args.request)
+    command = process_request(request)
 
     # 输出结果
     if command:
         execute_command(command, should_run)  # 显示并执行命令
-        return 0
     else:
-        return 1
+        raise typer.Exit(code=1)
+
+
+def cli():
+    """Typer application entry point"""
+    init_env("")
+    set_config("JARVIS_PRINT_PROMPT", "false")
+    app()
+
+
+def main():
+    """Main entry point for the script"""
+    cli()
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    main()

jarvis/jarvis_stats/__init__.py

@@ -0,0 +1,13 @@
+"""
+Jarvis统计模块
+
+提供指标统计、数据持久化、可视化展示等功能
+"""
+
+from jarvis.jarvis_stats.stats import StatsManager
+from jarvis.jarvis_stats.storage import StatsStorage
+from jarvis.jarvis_stats.visualizer import StatsVisualizer
+
+__all__ = ["StatsManager", "StatsStorage", "StatsVisualizer"]
+
+__version__ = "1.0.0"