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

jarvis/jarvis_sec/status.py

@@ -9,16 +9,19 @@
 import json
 from datetime import datetime
 from pathlib import Path
-from typing import Dict, Optional, Any
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import cast
 
 
 class StatusManager:
     """进度状态管理器"""
-    
+
     def __init__(self, entry_path: str):
         """
         初始化状态管理器
-        
+
         Args:
             entry_path: 待分析的根目录路径（可以是项目根目录或 .jarvis/sec 目录）
         """
@@ -30,21 +33,21 @@ class StatusManager:
             sec_dir = self.entry_path / ".jarvis" / "sec"
         self.status_path = sec_dir / "status.json"
         self._ensure_dir()
-    
+
     def _ensure_dir(self):
         """确保状态文件目录存在"""
         self.status_path.parent.mkdir(parents=True, exist_ok=True)
-    
+
     def _read_status(self) -> Dict[str, Any]:
         """读取当前状态"""
         if not self.status_path.exists():
             return {}
         try:
             with self.status_path.open("r", encoding="utf-8") as f:
-                return json.load(f)
+                return cast(Dict[str, Any], json.load(f))
         except Exception:
             return {}
-    
+
     def _write_status(self, status: Dict[str, Any]):
         """写入状态文件"""
         try:
@@ -54,7 +57,7 @@ class StatusManager:
         except Exception:
             # 状态文件写入失败不影响主流程
             pass
-    
+
     def update_stage(
         self,
         stage: str,
@@ -66,7 +69,7 @@ class StatusManager:
     ):
         """
         更新当前阶段和进度
-        
+
         Args:
             stage: 阶段名称（pre_scan, clustering, verification, completed, error）
             progress: 进度百分比（0-100），如果为None则根据current/total计算
@@ -76,11 +79,11 @@ class StatusManager:
             details: 额外的详细信息
         """
         status = self._read_status()
-        
+
         # 计算进度百分比
         if progress is None and current is not None and total is not None and total > 0:
             progress = (current / total) * 100
-        
+
         # 更新状态
         status["stage"] = stage
         if progress is not None:
@@ -93,21 +96,20 @@ class StatusManager:
             status["message"] = message
         if details:
             status["details"] = details
-        
+
         # 设置阶段开始时间（如果是新阶段）
         if "stage_history" not in status:
             status["stage_history"] = []
-        
+
         # 检查是否是阶段切换
         last_stage = status.get("stage")
         if last_stage != stage:
-            status["stage_history"].append({
-                "stage": stage,
-                "started_at": datetime.utcnow().isoformat() + "Z"
-            })
-        
+            status["stage_history"].append(
+                {"stage": stage, "started_at": datetime.utcnow().isoformat() + "Z"}
+            )
+
         self._write_status(status)
-    
+
     def update_pre_scan(
         self,
         current_files: Optional[int] = None,
@@ -119,11 +121,11 @@ class StatusManager:
         details = {}
         if issues_found is not None:
             details["issues_found"] = issues_found
-        
+
         progress = None
         if current_files is not None and total_files is not None and total_files > 0:
             progress = (current_files / total_files) * 100
-        
+
         self.update_stage(
             stage="pre_scan",
             progress=progress,
@@ -132,7 +134,7 @@ class StatusManager:
             message=message or "正在进行启发式扫描...",
             details=details,
         )
-    
+
     def update_clustering(
         self,
         current_file: Optional[int] = None,
@@ -143,19 +145,19 @@ class StatusManager:
         message: Optional[str] = None,
     ):
         """更新聚类阶段状态"""
-        details = {}
+        details: Dict[str, Any] = {}
         if file_name:
             details["current_file"] = file_name
         if current_batch is not None:
             details["current_batch"] = current_batch
         if total_batches is not None:
             details["total_batches"] = total_batches
-        
+
         # 计算总体进度（文件级别）
         progress = None
         if current_file is not None and total_files is not None and total_files > 0:
             progress = (current_file / total_files) * 100
-        
+
         self.update_stage(
             stage="clustering",
             progress=progress,
@@ -164,7 +166,7 @@ class StatusManager:
             message=message or "正在进行聚类分析...",
             details=details,
         )
-    
+
     def update_review(
         self,
         current_review: Optional[int] = None,
@@ -172,13 +174,17 @@ class StatusManager:
         message: Optional[str] = None,
     ):
         """更新复核阶段状态"""
-        details = {}
-        
+        details: Dict[str, Any] = {}
+
         # 计算总体进度
         progress = None
-        if current_review is not None and total_reviews is not None and total_reviews > 0:
+        if (
+            current_review is not None
+            and total_reviews is not None
+            and total_reviews > 0
+        ):
             progress = (current_review / total_reviews) * 100
-        
+
         self.update_stage(
             stage="review",
             progress=progress,
@@ -187,7 +193,7 @@ class StatusManager:
             message=message or "正在进行无效聚类复核...",
             details=details,
         )
-    
+
     def update_verification(
         self,
         current_batch: Optional[int] = None,
@@ -200,19 +206,23 @@ class StatusManager:
         message: Optional[str] = None,
     ):
         """更新验证阶段状态"""
-        details = {}
+        details: Dict[str, Any] = {}
         if batch_id:
             details["batch_id"] = batch_id
         if file_name:
             details["file"] = file_name
         if issues_found is not None:
             details["issues_found"] = issues_found
-        
+
         # 计算总体进度（批次级别）
         progress = None
-        if current_batch is not None and total_batches is not None and total_batches > 0:
+        if (
+            current_batch is not None
+            and total_batches is not None
+            and total_batches > 0
+        ):
             progress = (current_batch / total_batches) * 100
-        
+
         self.update_stage(
             stage="verification",
             progress=progress,
@@ -221,7 +231,7 @@ class StatusManager:
             message=message or "正在进行安全验证...",
             details=details,
         )
-    
+
     def mark_completed(
         self,
         total_issues: Optional[int] = None,
@@ -231,14 +241,14 @@ class StatusManager:
         details = {}
         if total_issues is not None:
             details["total_issues"] = total_issues
-        
+
         self.update_stage(
             stage="completed",
             progress=100.0,
             message=message or "安全分析已完成",
             details=details,
         )
-    
+
     def mark_error(
         self,
         error_message: str,
@@ -248,17 +258,16 @@ class StatusManager:
         details = {"error_message": error_message}
         if error_type:
             details["error_type"] = error_type
-        
+
         self.update_stage(
             stage="error",
             message=f"发生错误: {error_message}",
             details=details,
         )
-    
+
     def get_status(self) -> Dict[str, Any]:
         """获取当前状态"""
         return self._read_status()
 
 
 __all__ = ["StatusManager"]
-

jarvis/jarvis_sec/types.py

@@ -2,8 +2,10 @@
 """
 Shared types for jarvis.jarvis_sec to avoid circular imports.
 """
+
 from dataclasses import dataclass
 
+
 @dataclass
 class Issue:
     language: str
@@ -17,4 +19,5 @@ class Issue:
     confidence: float
     severity: str = "medium"
 
+
 __all__ = ["Issue"]