jarvis-ai-assistant 0.7.8__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_sec/workflow.py

@@ -16,14 +16,18 @@ Jarvis 安全分析套件 —— Workflow（含可复现直扫基线）
 
 from dataclasses import asdict
 from pathlib import Path
-from typing import Any, Dict, Iterable, List, Optional, cast
-
-import typer
-
-from jarvis.jarvis_sec.checkers import analyze_c_files, analyze_rust_files
+from typing import Any
+from typing import Dict
+from typing import Iterable
+from typing import List
+from typing import Optional
+from typing import cast
+
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_sec.checkers import analyze_c_files
+from jarvis.jarvis_sec.checkers import analyze_rust_files
 from jarvis.jarvis_sec.types import Issue
 
-
 # ---------------------------
 # 数据结构
 # ---------------------------
@@ -50,7 +54,57 @@ def _iter_source_files(
         return
 
     exts = set((languages or ["c", "cpp", "h", "hpp", "rs"]))
-    excludes = set(exclude_dirs or [".git", "build", "out", "target", "dist", "bin", "obj", "third_party", "vendor", "deps", "dependencies", "libs", "libraries", "external", "node_modules", "test", "tests", "__tests__", "spec", "testsuite", "testdata", "benchmark", "benchmarks", "perf", "performance", "bench", "benches", "profiling", "profiler", "example", "examples", "tmp", "temp", "cache", ".cache", "docs", "doc", "documentation", "generated", "gen", "mocks", "fixtures", "samples", "sample", "playground", "sandbox"])
+    excludes = set(
+        exclude_dirs
+        or [
+            ".git",
+            "build",
+            "out",
+            "target",
+            "dist",
+            "bin",
+            "obj",
+            "third_party",
+            "vendor",
+            "deps",
+            "dependencies",
+            "libs",
+            "libraries",
+            "external",
+            "node_modules",
+            "test",
+            "tests",
+            "__tests__",
+            "spec",
+            "testsuite",
+            "testdata",
+            "benchmark",
+            "benchmarks",
+            "perf",
+            "performance",
+            "bench",
+            "benches",
+            "profiling",
+            "profiler",
+            "example",
+            "examples",
+            "tmp",
+            "temp",
+            "cache",
+            ".cache",
+            "docs",
+            "doc",
+            "documentation",
+            "generated",
+            "gen",
+            "mocks",
+            "fixtures",
+            "samples",
+            "sample",
+            "playground",
+            "sandbox",
+        ]
+    )
 
     for p in entry.rglob("*"):
         if not p.is_file():
@@ -69,11 +123,11 @@ def _iter_source_files(
             yield p.relative_to(entry)
 
 
-
 # ---------------------------
 # 汇总与报告
 # ---------------------------
 
+
 def direct_scan(
     entry_path: str,
     languages: Optional[List[str]] = None,
@@ -85,9 +139,56 @@ def direct_scan(
     """
     base = Path(entry_path).resolve()
     # 计算实际使用的排除目录列表
-    default_excludes = [".git", "build", "out", "target", "dist", "bin", "obj", "third_party", "vendor", "deps", "dependencies", "libs", "libraries", "external", "node_modules", "test", "tests", "__tests__", "spec", "testsuite", "testdata", "benchmark", "benchmarks", "perf", "performance", "bench", "benches", "profiling", "profiler", "example", "examples", "tmp", "temp", "cache", ".cache", "docs", "doc", "documentation", "generated", "gen", "mocks", "fixtures", "samples", "sample", "playground", "sandbox"]
+    default_excludes = [
+        ".git",
+        "build",
+        "out",
+        "target",
+        "dist",
+        "bin",
+        "obj",
+        "third_party",
+        "vendor",
+        "deps",
+        "dependencies",
+        "libs",
+        "libraries",
+        "external",
+        "node_modules",
+        "test",
+        "tests",
+        "__tests__",
+        "spec",
+        "testsuite",
+        "testdata",
+        "benchmark",
+        "benchmarks",
+        "perf",
+        "performance",
+        "bench",
+        "benches",
+        "profiling",
+        "profiler",
+        "example",
+        "examples",
+        "tmp",
+        "temp",
+        "cache",
+        ".cache",
+        "docs",
+        "doc",
+        "documentation",
+        "generated",
+        "gen",
+        "mocks",
+        "fixtures",
+        "samples",
+        "sample",
+        "playground",
+        "sandbox",
+    ]
     actual_excludes = exclude_dirs if exclude_dirs is not None else default_excludes
-    
+
     # 检查代码库中实际存在的排除目录
     excludes_set = set(actual_excludes)
     actual_excluded_dirs = []
@@ -96,14 +197,16 @@ def direct_scan(
             rel_path = item.relative_to(base)
             if str(rel_path) not in actual_excluded_dirs:
                 actual_excluded_dirs.append(str(rel_path))
-    
+
     if actual_excluded_dirs:
-        typer.secho("[jarvis-sec] 实际排除的目录:", fg=typer.colors.BLUE)
+        PrettyOutput.auto_print("[jarvis-sec] 实际排除的目录:")
         for dir_path in sorted(actual_excluded_dirs):
-            typer.secho(f"  - {dir_path}", fg=typer.colors.BLUE)
+            PrettyOutput.auto_print(f"  - {dir_path}")
     else:
-        typer.secho(f"[jarvis-sec] 未发现需要排除的目录（配置的排除目录: {', '.join(sorted(actual_excludes))}）", fg=typer.colors.BLUE)
-    
+        PrettyOutput.auto_print(
+            f"[jarvis-sec] 未发现需要排除的目录（配置的排除目录: {', '.join(sorted(actual_excludes))}）"
+        )
+
     files = list(_iter_source_files(entry_path, languages, exclude_dirs))
 
     # 按语言分组
@@ -114,10 +217,11 @@ def direct_scan(
 
     # 调用检查器（保持相对路径，基于 base_path 解析）
     issues_c = analyze_c_files(str(base), [str(p) for p in c_files]) if c_files else []
-    issues_r = analyze_rust_files(str(base), [str(p) for p in r_files]) if r_files else []
+    issues_r = (
+        analyze_rust_files(str(base), [str(p) for p in r_files]) if r_files else []
+    )
     issues: List[Issue] = issues_c + issues_r
 
-
     summary: Dict[str, Any] = {
         "total": len(issues),
         "by_language": {"c/cpp": 0, "rust": 0},
@@ -135,7 +239,9 @@ def direct_scan(
         cat_counts[it.category] = cat_counts.get(it.category, 0) + 1
         file_score[it.file] = file_score.get(it.file, 0) + 1
     # Top 风险文件
-    summary["top_risk_files"] = [f for f, _ in sorted(file_score.items(), key=lambda x: x[1], reverse=True)[:10]]
+    summary["top_risk_files"] = [
+        f for f, _ in sorted(file_score.items(), key=lambda x: x[1], reverse=True)[:10]
+    ]
 
     result = {
         "summary": summary,
@@ -159,7 +265,9 @@ def format_markdown_report(result_json: Dict) -> str:
     md.append("")
     md.append("## 统计概览")
     by_lang = s.get("by_language", {})
-    md.append(f"- 按语言: c/cpp={by_lang.get('c/cpp', 0)}, rust={by_lang.get('rust', 0)}")
+    md.append(
+        f"- 按语言: c/cpp={by_lang.get('c/cpp', 0)}, rust={by_lang.get('rust', 0)}"
+    )
     md.append("- 按类别:")
     for k, v in s.get("by_category", {}).items():
         md.append(f"  - {k}: {v}")
@@ -170,7 +278,9 @@ def format_markdown_report(result_json: Dict) -> str:
     md.append("")
     md.append("## 详细问题")
     for i, it in enumerate(issues, start=1):
-        md.append(f"### [{i}] {it.get('file')}:{it.get('line')} ({it.get('language')}, {it.get('category')})")
+        md.append(
+            f"### [{i}] {it.get('file')}:{it.get('line')} ({it.get('language')}, {it.get('category')})"
+        )
         md.append(f"- 模式: {it.get('pattern')}")
         md.append(f"- 证据: `{it.get('evidence')}`")
         md.append(f"- 描述: {it.get('description')}")
@@ -205,6 +315,7 @@ def run_with_agent(
     - enable_verification: 是否启用二次验证（默认 True），关闭后分析Agent确认的问题将直接写入报告
     """
     from jarvis.jarvis_sec import run_security_analysis  # 延迟导入，避免循环
+
     return run_security_analysis(
         entry_path,
         languages=languages,
@@ -223,4 +334,4 @@ __all__ = [
     "direct_scan",
     "format_markdown_report",
     "run_with_agent",
-]
+]

jarvis/jarvis_smart_shell/main.py

@@ -1,13 +1,16 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import os
-from typing import Optional, Tuple
+from typing import Optional
+from typing import 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.config import get_shell_name
+from jarvis.jarvis_utils.config import set_config
 from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
 app = typer.Typer(
@@ -22,7 +25,7 @@ Example:
 
 def execute_command(command: str, should_run: bool) -> None:
     """Print command without execution"""
-    print(command)
+    PrettyOutput.auto_print(command)
     if should_run:
         os.system(command)
 
@@ -114,7 +117,7 @@ def install_jss_completion(
 ) -> None:
     """为指定的shell安装'命令未找到'处理器，实现自然语言命令建议"""
     if shell not in ("fish", "bash", "zsh"):
-        print(
+        PrettyOutput.auto_print(
             f"❌ 错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh"
         )
         raise typer.Exit(code=1)
@@ -124,7 +127,7 @@ def install_jss_completion(
         start_marker, end_marker = _get_markers()
 
         if not os.path.exists(config_file):
-            print("ℹ️ 未找到 config.fish 文件，将创建新文件")
+            PrettyOutput.auto_print("ℹ️ 未找到 config.fish 文件，将创建新文件")
             os.makedirs(os.path.dirname(config_file), exist_ok=True)
             with open(config_file, "w") as f:
                 f.write("")
@@ -133,7 +136,7 @@ def install_jss_completion(
             content = f.read()
 
         if start_marker in content:
-            print(
+            PrettyOutput.auto_print(
                 "✅ JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish"
             )
             return
@@ -155,7 +158,7 @@ end
 {end_marker}
 """
             )
-        print(
+        PrettyOutput.auto_print(
             "✅ JSS fish completion 已安装，请执行: source ~/.config/fish/config.fish"
         )
     elif shell == "bash":
@@ -163,7 +166,7 @@ end
         start_marker, end_marker = _get_bash_markers()
 
         if not os.path.exists(config_file):
-            print("ℹ️ 未找到 ~/.bashrc 文件，将创建新文件")
+            PrettyOutput.auto_print("ℹ️ 未找到 ~/.bashrc 文件，将创建新文件")
             os.makedirs(os.path.dirname(config_file), exist_ok=True)
             with open(config_file, "w") as f:
                 f.write("")
@@ -172,7 +175,7 @@ end
             content = f.read()
 
         if start_marker in content:
-            print(
+            PrettyOutput.auto_print(
                 "✅ JSS bash completion 已安装，请执行: source ~/.bashrc"
             )
             return
@@ -217,7 +220,7 @@ command_not_found_handle() {{
 {end_marker}
 """
                 )
-            print(
+            PrettyOutput.auto_print(
                 "✅ JSS bash completion 已安装，请执行: source ~/.bashrc"
             )
     elif shell == "zsh":
@@ -225,7 +228,7 @@ command_not_found_handle() {{
         start_marker, end_marker = _get_zsh_markers()
 
         if not os.path.exists(config_file):
-            print("ℹ️ 未找到 ~/.zshrc 文件，将创建新文件")
+            PrettyOutput.auto_print("ℹ️ 未找到 ~/.zshrc 文件，将创建新文件")
             os.makedirs(os.path.dirname(config_file), exist_ok=True)
             with open(config_file, "w") as f:
                 f.write("")
@@ -234,7 +237,7 @@ command_not_found_handle() {{
             content = f.read()
 
         if start_marker in content:
-            print(
+            PrettyOutput.auto_print(
                 "✅ JSS zsh completion 已安装，请执行: source ~/.zshrc"
             )
             return
@@ -283,9 +286,7 @@ command_not_found_handler() {{
 {end_marker}
 """
             )
-        print(
-            "✅ JSS zsh completion 已安装，请执行: source ~/.zshrc"
-        )
+        PrettyOutput.auto_print("✅ JSS zsh completion 已安装，请执行: source ~/.zshrc")
         return
 
 
@@ -295,7 +296,7 @@ def uninstall_jss_completion(
 ) -> None:
     """卸载JSS shell'命令未找到'处理器"""
     if shell not in ("fish", "bash", "zsh"):
-        print(
+        PrettyOutput.auto_print(
             f"❌ 错误: 不支持的shell类型: {shell}, 仅支持fish, bash, zsh"
         )
         raise typer.Exit(code=1)
@@ -305,18 +306,14 @@ def uninstall_jss_completion(
         start_marker, end_marker = _get_markers()
 
         if not os.path.exists(config_file):
-            print(
-                "ℹ️ 未找到 JSS fish completion 配置，无需卸载"
-            )
+            PrettyOutput.auto_print("ℹ️ 未找到 JSS fish completion 配置，无需卸载")
             return
 
         with open(config_file, "r") as f:
             content = f.read()
 
         if start_marker not in content:
-            print(
-                "ℹ️ 未找到 JSS fish completion 配置，无需卸载"
-            )
+            PrettyOutput.auto_print("ℹ️ 未找到 JSS fish completion 配置，无需卸载")
             return
 
         new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
@@ -324,7 +321,7 @@ def uninstall_jss_completion(
         with open(config_file, "w") as f:
             f.write(new_content)
 
-        print(
+        PrettyOutput.auto_print(
             "✅ JSS fish completion 已卸载，请执行: source ~/.config/fish/config.fish"
         )
     elif shell == "bash":
@@ -332,18 +329,14 @@ def uninstall_jss_completion(
         start_marker, end_marker = _get_bash_markers()
 
         if not os.path.exists(config_file):
-            print(
-                "ℹ️ 未找到 JSS bash completion 配置，无需卸载"
-            )
+            PrettyOutput.auto_print("ℹ️ 未找到 JSS bash completion 配置，无需卸载")
             return
 
         with open(config_file, "r") as f:
             content = f.read()
 
         if start_marker not in content:
-            print(
-                "ℹ️ 未找到 JSS bash completion 配置，无需卸载"
-            )
+            PrettyOutput.auto_print("ℹ️ 未找到 JSS bash completion 配置，无需卸载")
             return
 
         new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
@@ -351,7 +344,7 @@ def uninstall_jss_completion(
         with open(config_file, "w") as f:
             f.write(new_content)
 
-        print(
+        PrettyOutput.auto_print(
             "✅ JSS bash completion 已卸载，请执行: source ~/.bashrc"
         )
     elif shell == "zsh":
@@ -359,18 +352,14 @@ def uninstall_jss_completion(
         start_marker, end_marker = _get_zsh_markers()
 
         if not os.path.exists(config_file):
-            print(
-                "ℹ️ 未找到 JSS zsh completion 配置，无需卸载"
-            )
+            PrettyOutput.auto_print("ℹ️ 未找到 JSS zsh completion 配置，无需卸载")
             return
 
         with open(config_file, "r") as f:
             content = f.read()
 
         if start_marker not in content:
-            print(
-                "ℹ️ 未找到 JSS zsh completion 配置，无需卸载"
-            )
+            PrettyOutput.auto_print("ℹ️ 未找到 JSS zsh completion 配置，无需卸载")
             return
 
         new_content = content.split(start_marker)[0] + content.split(end_marker)[-1]
@@ -378,9 +367,7 @@ def uninstall_jss_completion(
         with open(config_file, "w") as f:
             f.write(new_content)
 
-        print(
-            "✅ JSS zsh completion 已卸载，请执行: source ~/.zshrc"
-        )
+        PrettyOutput.auto_print("✅ JSS zsh completion 已卸载，请执行: source ~/.zshrc")
 
 
 def process_request(request: str) -> Optional[str]:
@@ -437,7 +424,7 @@ def process_request(request: str) -> Optional[str]:
 def request_command(
     request: Optional[str] = typer.Argument(
         None, help="描述您想要执行的操作（用自然语言描述），如果未提供则从标准输入读取"
-    )
+    ),
 ):
     """描述您想要执行的操作（用自然语言描述）"""
     should_run = False
@@ -459,7 +446,7 @@ def request_command(
 def cli():
     """Typer application entry point"""
     init_env("")
-    set_config("JARVIS_PRINT_PROMPT", "false")
+    set_config("print_prompt", "false")
     app()
 
 

jarvis/jarvis_stats/cli.py

@@ -5,17 +5,23 @@
 """
 
 import builtins
-from datetime import datetime, timedelta
-from typing import Optional, List
+from datetime import datetime
+from datetime import timedelta
+from pathlib import Path
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Set
+
 import typer
+from rich import print as rprint
 from rich.console import Console
 from rich.table import Table
-from rich import print as rprint
-from pathlib import Path
 
-from .stats import StatsManager
-from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.utils import init_env
+
+from .stats import StatsManager
 
 app = typer.Typer(help="Jarvis 统计模块命令行工具")
 console = Console()
@@ -117,7 +123,6 @@ def show(
 
     stats.show(
         metric_name=metric,
-
         aggregation=aggregation,
         tags=tag_dict if tag_dict else None,
     )
@@ -198,7 +203,7 @@ def list():
             count = len(records)
 
             # 收集所有唯一的标签
-            all_tags = {}
+            all_tags: Dict[str, Set[str]] = {}
             for record in records:
                 tags = record.get("tags", {})
                 for k, v in tags.items():
@@ -248,16 +253,13 @@ def clean(
 @app.command()
 def export(
     metric: str = typer.Argument(..., help="指标名称"),
-
-
-
     tags: Optional[List[str]] = typer.Option(
         None, "--tag", "-t", help="标签过滤，格式: key=value"
     ),
 ):
     """导出统计数据"""
-    import json
     import csv
+    import json
     import sys
 
     stats = StatsManager(_get_stats_dir())

jarvis/jarvis_stats/stats.py

@@ -4,12 +4,19 @@
 提供统计数据的增加、查看、分析等功能的主接口
 """
 
-from datetime import datetime, timedelta
-from typing import Dict, List, Optional, Union, Any
+from jarvis.jarvis_utils.output import PrettyOutput
+
+from datetime import datetime
+from datetime import timedelta
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Union
 
 from jarvis.jarvis_stats.storage import StatsStorage
 from jarvis.jarvis_stats.visualizer import StatsVisualizer
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput  # 保留用于语法高亮
+from jarvis.jarvis_utils.output import OutputType  # 保留用于语法高亮
 
 
 class StatsManager:
@@ -191,10 +198,14 @@ class StatsManager:
                         created_at = info.get("created_at")
                         last_updated = info.get("last_updated")
                         start_dt = start_time or (
-                            datetime.fromisoformat(created_at) if created_at else datetime.now()
+                            datetime.fromisoformat(created_at)
+                            if created_at
+                            else datetime.now()
                         )
                         end_dt = end_time or (
-                            datetime.fromisoformat(last_updated) if last_updated else datetime.now()
+                            datetime.fromisoformat(last_updated)
+                            if last_updated
+                            else datetime.now()
                         )
                     except Exception:
                         start_dt = start_time or (datetime.now() - timedelta(days=7))
@@ -270,10 +281,14 @@ class StatsManager:
                         created_at = info.get("created_at")
                         last_updated = info.get("last_updated")
                         start_dt = start_time or (
-                            datetime.fromisoformat(created_at) if created_at else datetime.now()
+                            datetime.fromisoformat(created_at)
+                            if created_at
+                            else datetime.now()
                         )
                         end_dt = end_time or (
-                            datetime.fromisoformat(last_updated) if last_updated else datetime.now()
+                            datetime.fromisoformat(last_updated)
+                            if last_updated
+                            else datetime.now()
                         )
                     except Exception:
                         start_dt = start_time or (datetime.now() - timedelta(days=7))
@@ -422,8 +437,6 @@ class StatsManager:
             if start_time is None:
                 start_time = end_time - timedelta(days=7)
 
-
-
         # 计算时间范围列标题
         if start_time is None or end_time is None:
             period_label = "值"
@@ -446,7 +459,7 @@ class StatsManager:
         displayed_count = 0
         for metric in metrics:
             # 获取该指标的记录（全历史或指定范围）
-            if 'all_time' in locals() and all_time:
+            if "all_time" in locals() and all_time:
                 _start = None
                 _end = None
                 try:
@@ -549,9 +562,7 @@ class StatsManager:
         )
 
         if not aggregated:
-            print(
-                f"⚠️ 没有找到指标 '{metric_name}' 的数据"
-            )
+            PrettyOutput.auto_print(f"⚠️ 没有找到指标 '{metric_name}' 的数据")
             return
 
         # 获取指标信息
@@ -588,8 +599,8 @@ class StatsManager:
         PrettyOutput.print(chart, OutputType.CODE, lang="text")  # 保留用于语法高亮
 
         # 显示时间范围
-        from rich.panel import Panel
         from rich.console import Console
+        from rich.panel import Panel
 
         console = Console()
         console.print(
@@ -681,9 +692,7 @@ class StatsManager:
         )
 
         if not aggregated:
-            print(
-                f"⚠️ 没有找到指标 '{metric_name}' 的数据"
-            )
+            PrettyOutput.auto_print(f"⚠️ 没有找到指标 '{metric_name}' 的数据")
             return
 
         # 获取指标信息
@@ -693,11 +702,11 @@ class StatsManager:
         # 显示汇总
         summary = visualizer.show_summary(aggregated, metric_name, unit, tags)
         if summary:  # 如果返回了内容才打印（兼容性）
-            print(f"ℹ️ {summary}")
+            PrettyOutput.auto_print(f"ℹ️ {summary}")
 
         # 显示时间范围
-        from rich.panel import Panel
         from rich.console import Console
+        from rich.panel import Panel
 
         console = Console()
         console.print(