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

jarvis/jarvis_sec/analysis.py

@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
 """分析相关模块"""
 
-from typing import Dict, List, Optional
-import typer
+from typing import Dict
+from typing import List
+from typing import Optional
+
+from jarvis.jarvis_utils.output import PrettyOutput
 
 from jarvis.jarvis_agent import Agent
-from jarvis.jarvis_sec.prompts import build_summary_prompt
 from jarvis.jarvis_sec.parsers import try_parse_summary_report
+from jarvis.jarvis_sec.prompts import build_summary_prompt
 from jarvis.jarvis_sec.utils import git_restore_if_dirty
 
 
@@ -49,9 +52,12 @@ def valid_items(items: Optional[List]) -> bool:
     return True
 
 
-def build_analysis_task_context(batch: List[Dict], entry_path: str, langs: List[str]) -> str:
+def build_analysis_task_context(
+    batch: List[Dict], entry_path: str, langs: List[str]
+) -> str:
     """构建分析任务上下文"""
     import json as _json2
+
     batch_ctx: List[Dict] = list(batch)
     cluster_verify = str(batch_ctx[0].get("verify") if batch_ctx else "")
     cluster_gids_ctx = [it.get("gid") for it in batch_ctx]
@@ -76,7 +82,12 @@ def build_validation_error_guidance(
 ) -> str:
     """构建验证错误指导信息"""
     if parse_error_analysis:
-        return f"\n\n**格式错误详情（请根据以下错误修复输出格式）：**\n- JSON解析失败: {parse_error_analysis}\n\n请确保输出的JSON格式正确，包括正确的引号、逗号、大括号等。仅输出一个 <REPORT> 块，块内直接包含 JSON 数组（不需要额外的标签）。支持jsonnet语法（如尾随逗号、注释、||| 或 ``` 分隔符多行字符串等）。"
+        return f"""
+
+**格式错误详情（请根据以下错误修复输出格式）：**
+- JSON解析失败: {parse_error_analysis}
+
+请确保输出的JSON格式正确，包括正确的引号、逗号、大括号等。仅输出一个 <REPORT> 块，块内直接包含 JSON 数组（不需要额外的标签）。支持jsonnet语法（如尾随逗号、注释、||| 或 ``` 分隔符多行字符串等）。"""
     elif prev_parsed_items is None:
         return "\n\n**格式错误详情（请根据以下错误修复输出格式）：**\n- 无法从摘要中解析出有效的 JSON 数组"
     elif not valid_items(prev_parsed_items):
@@ -102,29 +113,47 @@ def build_validation_error_guidance(
                             validation_errors.append(f"元素{idx}的 gid 必须 >= 1")
                             break
                     except Exception:
-                        validation_errors.append(f"元素{idx}的 gid 格式错误（必须是整数）")
+                        validation_errors.append(
+                            f"元素{idx}的 gid 格式错误（必须是整数）"
+                        )
                         break
                 elif has_gids:
-                    if not isinstance(it.get("gids"), list) or len(it.get("gids", [])) == 0:
+                    if (
+                        not isinstance(it.get("gids"), list)
+                        or len(it.get("gids", [])) == 0
+                    ):
                         validation_errors.append(f"元素{idx}的 gids 必须是非空数组")
                         break
                     try:
                         for gid_idx, gid_val in enumerate(it.get("gids", [])):
                             if int(gid_val) < 1:
-                                validation_errors.append(f"元素{idx}的 gids[{gid_idx}] 必须 >= 1")
+                                validation_errors.append(
+                                    f"元素{idx}的 gids[{gid_idx}] 必须 >= 1"
+                                )
                                 break
                         if validation_errors:
                             break
                     except Exception:
-                        validation_errors.append(f"元素{idx}的 gids 格式错误（必须是整数数组）")
+                        validation_errors.append(
+                            f"元素{idx}的 gids 格式错误（必须是整数数组）"
+                        )
                         break
                 if "has_risk" not in it or not isinstance(it.get("has_risk"), bool):
-                    validation_errors.append(f"元素{idx}缺少必填字段 has_risk（必须是布尔值）")
+                    validation_errors.append(
+                        f"元素{idx}缺少必填字段 has_risk（必须是布尔值）"
+                    )
                     break
                 if it.get("has_risk"):
-                    for key in ["preconditions", "trigger_path", "consequences", "suggestions"]:
+                    for key in [
+                        "preconditions",
+                        "trigger_path",
+                        "consequences",
+                        "suggestions",
+                    ]:
                         if key not in it:
-                            validation_errors.append(f"元素{idx}的 has_risk 为 true，但缺少必填字段 {key}")
+                            validation_errors.append(
+                                f"元素{idx}的 has_risk 为 true，但缺少必填字段 {key}"
+                            )
                             break
                         if not isinstance(it[key], str) or not it[key].strip():
                             validation_errors.append(f"元素{idx}的 {key} 字段不能为空")
@@ -132,7 +161,9 @@ def build_validation_error_guidance(
                     if validation_errors:
                         break
         if validation_errors:
-            return "\n\n**格式错误详情（请根据以下错误修复输出格式）：**\n" + "\n".join(f"- {err}" for err in validation_errors)
+            return "\n\n**格式错误详情（请根据以下错误修复输出格式）：**\n" + "\n".join(
+                f"- {err}" for err in validation_errors
+            )
     return ""
 
 
@@ -152,21 +183,25 @@ def run_analysis_agent_with_retry(
     prev_parsed_items: Optional[List] = None
     parse_error_analysis: Optional[str] = None
     attempt = 0
-    
+
     while True:
         attempt += 1
         summary_container["text"] = ""
-        
+
         if use_direct_model_analysis:
             summary_prompt_text = build_summary_prompt()
-            error_guidance = build_validation_error_guidance(parse_error_analysis, prev_parsed_items)
+            error_guidance = build_validation_error_guidance(
+                parse_error_analysis, prev_parsed_items
+            )
             full_prompt = f"{per_task}{error_guidance}\n\n{summary_prompt_text}"
             try:
-                response = agent.model.chat_until_success(full_prompt)  # type: ignore
+                response = agent.model.chat_until_success(full_prompt)
                 summary_container["text"] = response
             except Exception as e:
                 try:
-                    typer.secho(f"[jarvis-sec] 直接模型调用失败: {e}，回退到 run()", fg=typer.colors.YELLOW)
+                    PrettyOutput.auto_print(
+                        f"⚠️ [jarvis-sec] 直接模型调用失败: {e}，回退到 run()"
+                    )
                 except Exception:
                     pass
                 agent.run(per_task)
@@ -181,15 +216,19 @@ def run_analysis_agent_with_retry(
                 "changed_files_count": int(_changed or 0),
                 "action": "git checkout -- .",
             }
-            meta_records.append({
-                "task_id": task_id,
-                "batch_index": bidx,
-                "workspace_restore": workspace_restore_info,
-                "attempt": attempt + 1,
-            })
+            meta_records.append(
+                {
+                    "task_id": task_id,
+                    "batch_index": bidx,
+                    "workspace_restore": workspace_restore_info,
+                    "attempt": attempt + 1,
+                }
+            )
             if _changed:
                 try:
-                    typer.secho(f"[jarvis-sec] 工作区已恢复 ({_changed} 个文件），操作: git checkout -- .", fg=typer.colors.BLUE)
+                    PrettyOutput.auto_print(
+                        f"🔵 [jarvis-sec] 工作区已恢复 ({_changed} 个文件），操作: git checkout -- ."
+                    )
                 except Exception:
                     pass
         except Exception:
@@ -203,7 +242,9 @@ def run_analysis_agent_with_retry(
             rep, parse_error_analysis = try_parse_summary_report(summary_text)
             if parse_error_analysis:
                 try:
-                    typer.secho(f"[jarvis-sec] 分析结果JSON解析失败: {parse_error_analysis}", fg=typer.colors.YELLOW)
+                    PrettyOutput.auto_print(
+                        f"⚠️ [jarvis-sec] 分析结果JSON解析失败: {parse_error_analysis}"
+                    )
                 except Exception:
                     pass
             elif isinstance(rep, list):
@@ -224,30 +265,36 @@ def run_analysis_agent_with_retry(
                 # 非空数组需要验证格式
                 summary_items = parsed_items
                 break
-        
+
         # 格式校验失败，后续重试使用直接模型调用
         use_direct_model_analysis = True
         prev_parsed_items = parsed_items
         if parse_error_analysis:
             try:
-                typer.secho(f"[jarvis-sec] 分析结果JSON解析失败 -> 重试第 {attempt} 次 (批次={bidx}，使用直接模型调用，将反馈解析错误)", fg=typer.colors.YELLOW)
+                PrettyOutput.auto_print(
+                    f"⚠️ [jarvis-sec] 分析结果JSON解析失败 -> 重试第 {attempt} 次 (批次={bidx}，使用直接模型调用，将反馈解析错误)"
+                )
             except Exception:
                 pass
         else:
             try:
-                typer.secho(f"[jarvis-sec] 分析结果格式无效 -> 重试第 {attempt} 次 (批次={bidx}，使用直接模型调用)", fg=typer.colors.YELLOW)
+                PrettyOutput.auto_print(
+                    f"⚠️ [jarvis-sec] 分析结果格式无效 -> 重试第 {attempt} 次 (批次={bidx}，使用直接模型调用)"
+                )
             except Exception:
                 pass
-    
+
     return summary_items, workspace_restore_info
 
 
-def expand_and_filter_analysis_results(summary_items: List[Dict]) -> tuple[List[Dict], List[Dict]]:
+def expand_and_filter_analysis_results(
+    summary_items: List[Dict],
+) -> tuple[List[Dict], List[Dict]]:
     """展开gids格式为单个gid格式，并过滤出有风险的项目"""
     items_with_risk: List[Dict] = []
     items_without_risk: List[Dict] = []
     merged_items: List[Dict] = []
-    
+
     for it in summary_items:
         has_risk = it.get("has_risk") is True
         if "gids" in it and isinstance(it.get("gids"), list):
@@ -272,5 +319,5 @@ def expand_and_filter_analysis_results(summary_items: List[Dict]) -> tuple[List[
                 items_with_risk.append(it)
             else:
                 items_without_risk.append(it)
-    
+
     return items_with_risk, items_without_risk

jarvis/jarvis_sec/checkers/__init__.py

@@ -7,18 +7,12 @@ Jarvis 安全演进多Agent套件 —— Checkers 包初始化
 - 保持最小依赖，不在此处执行任何扫描逻辑，仅做导入与别名暴露。
 """
 
-
-
-from .c_checker import (
-    analyze_files as analyze_c_files,
-    analyze_c_cpp_file,
-    analyze_c_cpp_text,
-)
-from .rust_checker import (
-    analyze_rust_files,
-    analyze_rust_file,
-    analyze_rust_text,
-)
+from .c_checker import analyze_c_cpp_file
+from .c_checker import analyze_c_cpp_text
+from .c_checker import analyze_files as analyze_c_files
+from .rust_checker import analyze_rust_file
+from .rust_checker import analyze_rust_files
+from .rust_checker import analyze_rust_text
 
 __all__ = [
     # C/C++
@@ -29,4 +23,4 @@ __all__ = [
     "analyze_rust_files",
     "analyze_rust_file",
     "analyze_rust_text",
-]
+]