fix

api_routes.py

@@ -288,7 +288,6 @@ from models import (
 
 from face_analyzer import EnhancedFaceAnalyzer
 from utils import (
-    save_image_force_compress,
     save_image_high_quality,
     save_image_with_transparency,
     human_readable_size,
@@ -1095,7 +1094,7 @@ async def analyze_face(
     original_md5_hash = str(uuid.uuid4()).replace('-', '')
     original_image_filename = f"{original_md5_hash}_original.webp"
     original_image_path = os.path.join(IMAGES_DIR, original_image_filename)
-    save_image_force_compress(image, original_image_path, max_size_kb=500)
+    save_image_high_quality(image, original_image_path, quality=SAVE_QUALITY)
     # 🔥 添加图片安全检测
     t1 = time.perf_counter()
     is_safe = await wx_access_token.check_image_security(contents)
@@ -1254,8 +1253,8 @@ async def analyze_face(
                 if result.get("success") and annotated_image_np is not None:
                     original_image_path = os.path.join(OUTPUT_DIR, original_image_filename)
                     save_start = time.perf_counter()
-                    save_success = save_image_force_compress(
-                        annotated_image_np, original_image_path, max_size_kb=100
+                    save_success = save_image_high_quality(
+                        annotated_image_np, original_image_path, quality=SAVE_QUALITY
                     )
                     _log_stage_duration(
                         "标注图保存",

face_analyzer.py

@@ -11,7 +11,7 @@ from config import logger, MODELS_PATH, OUTPUT_DIR, DEEPFACE_AVAILABLE, \
     YOLO_AVAILABLE
 from facial_analyzer import FacialFeatureAnalyzer
 from models import ModelType
-from utils import save_image_force_compress
+from utils import save_image_high_quality
 
 if DEEPFACE_AVAILABLE:
     from deepface import DeepFace
@@ -949,9 +949,7 @@ class EnhancedFaceAnalyzer:
             cropped_face_filename = f"{original_image_hash}_face_{i + 1}.webp"
             cropped_face_path = os.path.join(OUTPUT_DIR, cropped_face_filename)
             try:
-                save_image_force_compress(
-                    face_cropped, cropped_face_path, max_size_kb=100
-                )
+                save_image_high_quality(face_cropped, cropped_face_path)
                 logger.info(f"cropped face: {cropped_face_path}")
             except Exception as e:
                 logger.error(f"Failed to save cropped face {cropped_face_path}: {e}")

utils.py

@@ -22,7 +22,6 @@ except ImportError:
 
 from config import (
     IMAGES_DIR,
-    IMG_QUALITY,
     logger,
     SAVE_QUALITY,
     MODELS_PATH,
@@ -611,54 +610,6 @@ def save_base64_to_unique_file(
         return None
 
 
-def save_image_force_compress(
-    image: np.ndarray,
-    output_path: str,
-    max_size_kb: int = 100,
-    min_scale: float = 0.1,
-    scale_step: float = 0.9,
-    initial_quality: int = 95,
-    min_quality: int = 10,
-    quality_step: int = 5,
-) -> bool:
-    """
-    强制压缩图像到 max_size_kb 以下，即使原图已小于该大小。
-    先缩小尺寸再压缩质量，直到满足要求或失败。
-    """
-    max_bytes = max_size_kb * 1024
-    scale = IMG_QUALITY
-    height, width = image.shape[:2]
-    while scale >= min_scale:
-        resized_img = cv2.resize(
-            image,
-            (int(width * scale), int(height * scale)),
-            interpolation=cv2.INTER_AREA,
-        )
-        quality = initial_quality
-
-        while quality >= min_quality:
-            success, encoded_img = cv2.imencode(
-                ".webp", resized_img, [cv2.IMWRITE_WEBP_QUALITY, quality]
-            )
-            if not success:
-                return False
-
-            if len(encoded_img) <= max_bytes:
-                with open(output_path, "wb") as f:
-                    f.write(encoded_img)
-                logger.info(
-                    f"压缩后图像大小: {len(encoded_img) / 1024:.2f} KB，scale={scale:.2f}, quality={quality}"
-                )
-                upload_file_to_bos(output_path)
-                return True
-
-            quality -= quality_step
-
-        scale *= scale_step
-
-    return False
-
-
 def human_readable_size(size_bytes):
     """人性化文件大小展示"""
     for unit in ["B", "KB", "MB", "GB"]: