Update app.py

app.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 """
-🎨 FaceFusion API для Hugging Face Spaces — FIXED VERSION
-✅ Skip NSFW filter (avoid open_nsfw hash error)
-✅ Read UploadFile once and reuse bytes (fix 0b on retry)
+🎨 FaceFusion API для Hugging Face Spaces — FINAL FIXED VERSION
+✅ Disable NSFW via ENV variable (not CLI arg)
+✅ Read UploadFile once and reuse bytes
+✅ Allow model re-download if corrupted
 ✅ ghost_3_256 maximum quality
 """
 
-import os, sys, tempfile, subprocess, logging, shutil, time, io
+import os, sys, tempfile, subprocess, logging, shutil, time
 from pathlib import Path
 from contextlib import asynccontextmanager
 from fastapi import FastAPI, File, UploadFile, HTTPException, Query
@@ -20,13 +21,14 @@ async def lifespan(app: FastAPI):
     logger.info("🚀 FaceFusion CPU API (ghost_3_256) starting...")
     logger.info("📁 Cache: /tmp/facefusion_cache")
     logger.info("⚙️ Default: ghost_3_256 + gfpgan_1.4")
-    logger.info("🔕 NSFW filter: disabled (avoid hash errors)")
+    logger.info("🔕 NSFW filter: disabled via ENV")
+    logger.info("🔄 Model re-download: enabled")
     logger.info("⏱️ Timeout: 900s")
     logger.info("✅ API ready!")
     yield
     logger.info("👋 API shutting down...")
 
-app = FastAPI(title="FaceFusion CPU API — High Quality", version="2.1", lifespan=lifespan)
+app = FastAPI(title="FaceFusion CPU API — High Quality", version="2.2", lifespan=lifespan)
 
 FACEFUSION_DIR = Path("/facefusion")
 FACEFUSION_PY = FACEFUSION_DIR / "facefusion.py"
@@ -48,19 +50,22 @@ CONFIG = {
     "output_image_quality": "90",
     "timeout_high_quality": 900,
     "timeout_standard": 600,
-    "skip_download": False,  # 🔥 Разрешить докачку если модель повреждена
+    "skip_download": False,  # 🔥 Разрешить перескачку если модель повреждена
     "log_level": "error",
 }
 
+# 🔥 Отключаем NSFW фильтр через ENV переменную
+os.environ["FACEFUSION_CONTENT_ANALYSER"] = "none"
+
 AVAILABLE_SWAPPERS = ["ghost_3_256", "ghost_2_256", "ghost_1_256", "inswapper_128", "simswap_256"]
-AVAILABLE_ENHANCERS = ["gfpgan_1.4", "gfpgan_1.3", "codeformer", None]
 
 @app.get("/")
 async def root():
     return {
         "service": "FaceFusion CPU API — High Quality",
-        "version": "2.1",
+        "version": "2.2",
         "default_swapper": CONFIG["face_swapper"],
+        "nsfw_disabled": os.environ.get("FACEFUSION_CONTENT_ANALYSER") == "none",
         "status": "running"
     }
 
@@ -89,7 +94,6 @@ async def swap_face(
     
     logger.info(f"📥 Request: source={len(source_bytes)}b, target={len(target_bytes)}b")
     
-    # Нормализуем enhancer_model
     if enhancer_model and enhancer_model.lower() == "none":
         enhancer_model = None
     
@@ -103,12 +107,11 @@ async def swap_face(
         logger.info(f"🔄 Attempt {attempt}/{len(models_to_try)}: {model}")
         
         try:
-            # 🔥 ПЕРЕДАЁМ bytes, а не UploadFile — можно читать много раз!
             result = await _process_face_swap(
                 source_bytes=source_bytes,
                 target_bytes=target_bytes,
                 swapper_model=model,
-                enhancer_model=enhancer_model if attempt == 1 else None,  # Без enhancer для fallback
+                enhancer_model=enhancer_model if attempt == 1 else None,
                 enhance_blend=enhance_blend,
                 timeout=CONFIG["timeout_high_quality"] if model.startswith("ghost") else CONFIG["timeout_standard"]
             )
@@ -141,15 +144,14 @@ async def _process_face_swap(
         
         logger.info(f"🔧 Processing: swapper={swapper_model}, enhancer={enhancer_model}")
         
-        # 🔥 ЗАПИСЫВАЕМ bytes в файлы (можно вызывать много раз)
         source_path.write_bytes(source_bytes)
         target_path.write_bytes(target_bytes)
         
-        # Формируем CLI команду
         processors = ["face_swapper"]
         if enhancer_model:
             processors.append("face_enhancer")
         
+        # 🔥 CLI команда БЕЗ --skip-nsfw-filter (не поддерживается)
         cmd = [
             "python", str(FACEFUSION_PY),
             "headless-run",
@@ -163,11 +165,11 @@ async def _process_face_swap(
             "--face-mask-padding", *map(str, CONFIG["face_mask_padding"]),
             "--output-image-resolution", CONFIG["output_image_resolution"],
             "--output-image-quality", CONFIG["output_image_quality"],
-            "--skip-nsfw-filter",  # 🔥 ОТКЛЮЧАЕМ NSFW ФИЛЬТР (избегаем open_nsfw hash error)
+            # ❌ УБРАЛ: --skip-nsfw-filter (не поддерживается в этой версии)
             "--log-level", CONFIG["log_level"],
         ]
         
-        # 🔥 Не используем --skip-download если модель может быть повреждена
+        # ��� skip-download=False по умолчанию — разрешаем перескачку моделей
         if CONFIG["skip_download"]:
             cmd.append("--skip-download")
         
@@ -182,10 +184,12 @@ async def _process_face_swap(
         logger.info(f"🚀 Running: {' '.join(cmd)}")
         process_start = time.time()
         
+        # 🔥 Передаём ENV с отключённым NSFW
+        env = {**os.environ, "OMP_NUM_THREADS": "4", "FACEFUSION_CONTENT_ANALYSER": "none"}
+        
         process = subprocess.Popen(
             cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-            text=True, cwd=str(FACEFUSION_DIR),
-            env={**os.environ, "OMP_NUM_THREADS": "4"}
+            text=True, cwd=str(FACEFUSION_DIR), env=env
         )
         
         try:
@@ -199,8 +203,8 @@ async def _process_face_swap(
         logger.info(f"⏱️ Done in {elapsed:.1f}s, code={process.returncode}")
         
         if stderr:
-            # Фильтруем harmless libpng warnings
-            stderr_clean = '\n'.join(l for l in stderr.split('\n') if 'iCCP' not in l)
+            # Фильтруем harmless warnings
+            stderr_clean = '\n'.join(l for l in stderr.split('\n') if 'iCCP' not in l and 'libpng' not in l)
             if stderr_clean.strip():
                 logger.info(f"📋 STDERR: {stderr_clean[-400:]}")