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

jarvis/jarvis_code_agent/code_analyzer/build_validator/base.py

@@ -8,14 +8,18 @@
 """
 
 import subprocess
-from abc import ABC, abstractmethod
+from abc import ABC
+from abc import abstractmethod
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
 from enum import Enum
+from typing import List
+from typing import Optional
+from typing import Tuple
 
 
 class BuildSystem(Enum):
     """支持的构建系统类型"""
+
     UNKNOWN = "unknown"
     PYTHON = "python"
     NODEJS = "nodejs"
@@ -31,6 +35,7 @@ class BuildSystem(Enum):
 @dataclass
 class BuildResult:
     """构建验证结果"""
+
     success: bool
     output: str
     error_message: Optional[str] = None
@@ -40,27 +45,27 @@ class BuildResult:
 
 class BuildValidatorBase(ABC):
     """构建验证器基类"""
-    
+
     # 子类需要定义的类变量
     BUILD_SYSTEM_NAME: str = ""  # 构建系统名称，如 "CMake", "Makefile", "Cargo"
     SUPPORTED_LANGUAGES: List[str] = []  # 支持的语言列表，如 ["c", "cpp"]
-    
+
     def __init__(self, project_root: str, timeout: int = 30):
         self.project_root = project_root
         self.timeout = timeout
-    
+
     @abstractmethod
     def validate(self, modified_files: Optional[List[str]] = None) -> BuildResult:
         """验证构建
-        
+
         Args:
             modified_files: 修改的文件列表（可选，用于增量验证）
-        
+
         Returns:
             BuildResult: 验证结果
         """
         pass
-    
+
     def _run_command(
         self,
         cmd: List[str],
@@ -69,13 +74,13 @@ class BuildValidatorBase(ABC):
         capture_output: bool = True,
     ) -> Tuple[int, str, str]:
         """运行命令
-        
+
         Args:
             cmd: 命令列表
             cwd: 工作目录
             timeout: 超时时间（秒）
             capture_output: 是否捕获输出
-        
+
         Returns:
             (返回码, stdout, stderr)
         """
@@ -83,7 +88,7 @@ class BuildValidatorBase(ABC):
             cwd = self.project_root
         if timeout is None:
             timeout = self.timeout
-        
+
         try:
             result = subprocess.run(
                 cmd,
@@ -103,4 +108,3 @@ class BuildValidatorBase(ABC):
             return -1, "", f"命令未找到: {cmd[0]}"
         except Exception as e:
             return -1, "", f"执行命令时出错: {str(e)}"
-

jarvis/jarvis_code_agent/code_analyzer/build_validator/cmake.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
 """
 CMake构建验证器模块
 
@@ -10,20 +7,29 @@ CMake构建验证器模块
 import os
 import tempfile
 import time
-from typing import List, Optional
 
-from .base import BuildValidatorBase, BuildResult, BuildSystem
+from jarvis.jarvis_utils.output import PrettyOutput
+
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from typing import List
+from typing import Optional
+
+from .base import BuildResult
+from .base import BuildSystem
+from .base import BuildValidatorBase
 
 
 class CMakeBuildValidator(BuildValidatorBase):
     """CMake构建验证器"""
-    
+
     BUILD_SYSTEM_NAME = "CMake"
     SUPPORTED_LANGUAGES = ["c", "cpp"]
-    
+
     def validate(self, modified_files: Optional[List[str]] = None) -> BuildResult:
         start_time = time.time()
-        
+
         # 策略1: 尝试使用 cmake --build（如果已有构建目录）
         build_dirs = ["build", "cmake-build-debug", "cmake-build-release"]
         for build_dir in build_dirs:
@@ -37,10 +43,14 @@ class CMakeBuildValidator(BuildValidatorBase):
                 success = returncode == 0
                 output = stdout + stderr
                 if success:
-                    print(f"✅ CMake 构建验证成功（耗时 {duration:.2f} 秒）")
+                    PrettyOutput.auto_print(
+                        f"✅ CMake 构建验证成功（耗时 {duration:.2f} 秒）"
+                    )
                 else:
-                    print(f"❌ CMake 构建验证失败（耗时 {duration:.2f} 秒）")
-                    print(f"错误信息：CMake构建失败\n{output[:500]}")
+                    PrettyOutput.auto_print(
+                        f"❌ CMake 构建验证失败（耗时 {duration:.2f} 秒）"
+                    )
+                    PrettyOutput.auto_print(f"错误信息：CMake构建失败\n{output[:500]}")
                 return BuildResult(
                     success=success,
                     output=output,
@@ -48,7 +58,7 @@ class CMakeBuildValidator(BuildValidatorBase):
                     build_system=BuildSystem.C_CMAKE,
                     duration=duration,
                 )
-        
+
         # 策略2: 仅验证CMakeLists.txt语法
         with tempfile.TemporaryDirectory(prefix="cmake_check_") as tmpdir:
             returncode, stdout, stderr = self._run_command(
@@ -56,14 +66,14 @@ class CMakeBuildValidator(BuildValidatorBase):
                 timeout=10,
             )
         duration = time.time() - start_time
-        
+
         success = returncode == 0
         output = stdout + stderr
         if success:
-            print(f"✅ CMake 配置验证成功（耗时 {duration:.2f} 秒）")
+            PrettyOutput.auto_print(f"✅ CMake 配置验证成功（耗时 {duration:.2f} 秒）")
         else:
-            print(f"❌ CMake 配置验证失败（耗时 {duration:.2f} 秒）")
-            print(f"错误信息：CMake配置失败\n{output[:500]}")
+            PrettyOutput.auto_print(f"❌ CMake 配置验证失败（耗时 {duration:.2f} 秒）")
+            PrettyOutput.auto_print(f"错误信息：CMake配置失败\n{output[:500]}")
         return BuildResult(
             success=success,
             output=output,
@@ -71,4 +81,3 @@ class CMakeBuildValidator(BuildValidatorBase):
             build_system=BuildSystem.C_CMAKE,
             duration=duration,
         )
-