feat: upgrade default model to Wan 2.2 MoE suite and configure Civitai API key

README.md

@@ -1,5 +1,5 @@
 ---
-title: Wan 2.1 Studio
+title: Wan 2.2 Studio
 emoji: 🎬
 colorFrom: indigo
 colorTo: purple
@@ -8,17 +8,18 @@ sdk_version: 5.20.0
 app_file: app.py
 pinned: false
 license: apache-2.0
-short_description: Wan 2.1 Video Studio with Multi-LoRA and I2V/T2V
+short_description: Wan 2.2 Video Studio with Multi-LoRA and I2V/T2V
 suggested_hardware: zero-a10g
 ---
 
-# Wan 2.1 / 2.2 Video Studio (ZeroGPU + Multi-LoRA)
+# Wan 2.2 Video Studio (ZeroGPU + Multi-LoRA + Base NSFW)
 
-A high-performance AI video generation studio running **Wan 2.1 / Wan 2.2** on **ZeroGPU**.
+A high-performance AI video generation studio running **Wan 2.2 (MoE)** on **ZeroGPU**.
 
 ### Features:
-- 🖼️ **Image-to-Video (I2V)** and 📝 **Text-to-Video (T2V)** support.
+- 🚀 **Wan 2.2 MoE Architecture**: Native Diffusers integration (`Wan2.2-I2V-A14B`, `Wan2.2-TI2V-5B`, `Wan2.2-T2V-A14B`).
+- 🔞 **Base NSFW Adapter System**: Pre-loaded with `WAN General NSFW Model (Civitai 1307155)` to unlock full anatomical generation.
 - ⚡ **ZeroGPU Acceleration**: Runs with dynamic GPU scheduling on A10G / H100 hardware.
-- 🧩 **Multi-LoRA Engine**: Load up to 2 custom LoRAs from Civitai, Hugging Face, or local files with Trigger Words.
+- 🧩 **Multi-LoRA Engine**: Load custom action and style LoRAs from Civitai, Hugging Face, or local files with Trigger Words.
 - 📐 **300-Hours Civitai Optimization**: Strict multiple-of-16 aspect ratios (832x480, 480x832, 1280x720, etc.) for clean motion.
 - 📖 **Built-in Prompt & Anatomical Motion Guide**: Designed with the official structured prompt standards.

app.py

@@ -1,4 +1,4 @@
-"""Wan 2.1 / 2.2 Space with ZeroGPU, Multi-LoRA (Civitai + HF), Presets, Trigger Words, and 300-Hours Optimizations."""
+"""Wan 2.2 Space with ZeroGPU, Multi-LoRA (Civitai + HF), Presets, Trigger Words, and 300-Hours Optimizations."""
 
 from __future__ import annotations
 
@@ -52,7 +52,8 @@ from PIL import Image, ImageOps
 from diffusers.utils import export_to_video
 from safetensors import safe_open
 
-DEFAULT_MODEL_REPO = os.environ.get("WAN_MODEL_REPO", "Wan-AI/Wan2.1-I2V-14B-480P-Diffusers")
+DEFAULT_CIVITAI_KEY = "50a9e1bd474c03b856070a7272d8015c"
+DEFAULT_MODEL_REPO = os.environ.get("WAN_MODEL_REPO", "Wan-AI/Wan2.2-I2V-A14B-480P-Diffusers")
 GPU_SIZE = os.environ.get("WAN_GPU_SIZE", "xlarge")
 MAX_GPU_DURATION = int(os.environ.get("WAN_MAX_GPU_DURATION", "300"))
 OUTPUT_DIR = os.path.join(tempfile.gettempdir(), "wan-outputs")
@@ -85,7 +86,7 @@ NSFW_BASE_ADAPTERS = {
 }
 
 # =========================================================================
-# Preset Catalog for Wan 2.1 / 2.2 LoRAs (Actions, Motions & Styles)
+# Preset Catalog for Wan 2.2 LoRAs (Actions, Motions & Styles)
 # =========================================================================
 LORA_PRESETS = {
     "None / Desativado": {
@@ -99,16 +100,16 @@ LORA_PRESETS = {
         "source": "https://civitai.com/models/1307155",
         "trigger_words": "nsfwsks, uncensored, naked, explicit",
         "default_strength": 1.0,
-        "description": "LoRA Geral NSFW para Wan 2.1 / 2.2 (Civitai 1307155).",
+        "description": "LoRA Geral NSFW para Wan 2.2 (Civitai 1307155).",
     },
-    "HMNSFW AIO V2 / hmmotion (Wan 2.1 / 2.2)": {
+    "HMNSFW AIO V2 / hmmotion (Wan 2.2)": {
         "type": "civitai",
         "source": "https://civitai.com/api/download/models/3206518",
         "trigger_words": "hmmotion, missionary, side, fast, third-person side view, medium shot.",
         "default_strength": 0.5,
         "description": "LoRA All-in-One de anatomia e movimento realista (Civitai 2834417 / 3206518). Use força <= 0.5 com prompts descritivos.",
     },
-    "Icy Twerk Pro Max (Wan 2.1 / 2.2)": {
+    "Icy Twerk Pro Max (Wan 2.2)": {
         "type": "civitai",
         "source": "https://civitai.com/api/download/models/3201584",
         "trigger_words": "icytw3rk, twerking, booty shake, rhythmic hip movement, dynamic motion, bouncing buttocks, high quality",
@@ -265,7 +266,7 @@ def _validate_public_lora_url(url: str) -> str:
 def _download_lora_url(url: str, civitai_token: str = "") -> tuple[str, str]:
     import requests
 
-    token = (civitai_token or os.environ.get("CIVITAI_API_KEY", "") or os.environ.get("CIVITAI_TOKEN", "")).strip()
+    token = (civitai_token or os.environ.get("CIVITAI_API_KEY", "") or os.environ.get("CIVITAI_TOKEN", "") or DEFAULT_CIVITAI_KEY).strip()
 
     if "civitai." in url and token and "token=" not in url:
         sep = "&" if "?" in url else "?"
@@ -310,8 +311,7 @@ def _download_lora_url(url: str, civitai_token: str = "") -> tuple[str, str]:
                 if response.status_code in (401, 403):
                     raise gr.Error(
                         "🔒 O Civitai bloqueou o download deste modelo (401 Unauthorized / NSFW). "
-                        "Gere um Civitai API Key em https://civitai.com/user/account-settings "
-                        "e cole no campo 'Civitai API Key' no painel do Space."
+                        "Verifique sua Civitai API Key nas configurações."
                     )
                 response.raise_for_status()
                 total = 0
@@ -334,7 +334,7 @@ def _download_lora_url(url: str, civitai_token: str = "") -> tuple[str, str]:
             if "response" in locals() and response.status_code in (401, 403):
                 raise gr.Error(
                     "🔒 O Civitai bloqueou o download deste modelo (401 Unauthorized / NSFW). "
-                    "Gere um Civitai API Key em https://civitai.com/user/account-settings e cole no campo 'Civitai API Key'."
+                    "Verifique sua Civitai API Key nas configurações."
                 ) from err
             raise
     raise ValueError("Too many redirects downloading LoRA.")
@@ -343,7 +343,7 @@ def _download_lora_url(url: str, civitai_token: str = "") -> tuple[str, str]:
 def resolve_single_lora(
     preset_type: str, custom_url: str, hf_repo: str, hf_file: str, local_file: str, strength: float, civitai_token: str = ""
 ) -> tuple[str | None, str, float]:
-    """Resolves one LoRA file path, label and scale for Wan 2.1/2.2."""
+    """Resolves one LoRA file path, label and scale for Wan 2.2."""
     if float(strength) == 0.0 or preset_type in ("None / Desativado", "None", ""):
         return None, "None", 0.0
 
@@ -410,19 +410,31 @@ def load_pipeline(model_repo: str = DEFAULT_MODEL_REPO):
 
     started = time.time()
     try:
-        from diffusers import WanImageToVideoPipeline, WanPipeline
+        from diffusers import WanImageToVideoPipeline, WanPipeline, AutoPipelineForImage2Video, AutoPipelineForText2Video
 
         print(f"[wan] loading pipeline from {model_repo} ...", flush=True)
         if "I2V" in model_repo or "i2v" in model_repo:
-            pipe = WanImageToVideoPipeline.from_pretrained(
-                model_repo,
-                torch_dtype=torch.bfloat16,
-            )
+            try:
+                pipe = WanImageToVideoPipeline.from_pretrained(
+                    model_repo,
+                    torch_dtype=torch.bfloat16,
+                )
+            except Exception:
+                pipe = AutoPipelineForImage2Video.from_pretrained(
+                    model_repo,
+                    torch_dtype=torch.bfloat16,
+                )
         else:
-            pipe = WanPipeline.from_pretrained(
-                model_repo,
-                torch_dtype=torch.bfloat16,
-            )
+            try:
+                pipe = WanPipeline.from_pretrained(
+                    model_repo,
+                    torch_dtype=torch.bfloat16,
+                )
+            except Exception:
+                pipe = AutoPipelineForText2Video.from_pretrained(
+                    model_repo,
+                    torch_dtype=torch.bfloat16,
+                )
 
         PIPE = pipe
         CURRENT_MODEL_REPO = model_repo
@@ -509,7 +521,7 @@ def _generate_video_gpu(
 
     try:
         with torch.inference_mode():
-            if image_input is not None and ("I2V" in model_repo or "i2v" in model_repo):
+            if image_input is not None and ("I2V" in model_repo or "i2v" in model_repo or "TI2V" in model_repo):
                 output = pipe(
                     image=image_input,
                     prompt=prompt,
@@ -585,6 +597,7 @@ def generate_video(
     if input_image is not None:
         processed_image = _fit_keyframe(input_image, width, height)
 
+    token_to_use = (civitai_api_key or DEFAULT_CIVITAI_KEY).strip()
     lora_configs = []
     active_labels = []
 
@@ -594,13 +607,13 @@ def generate_video(
         if base_spec.get("source"):
             b_url = normalize_civitai_url(base_spec["source"])
             if b_url:
-                b_path, b_label = _download_lora_url(b_url, civitai_api_key)
+                b_path, b_label = _download_lora_url(b_url, token_to_use)
                 lora_configs.append((b_path, float(nsfw_base_strength)))
                 active_labels.append(f"🔞 NSFW Base: {nsfw_base_choice.split('(')[0].strip()} (@ {nsfw_base_strength:g})")
 
     # 2. Slot 1 LoRA
     l1_path, l1_label, l1_scale = resolve_single_lora(
-        lora1_preset, lora1_custom_url, lora1_hf_repo, lora1_hf_file, lora1_local_file, lora1_strength, civitai_api_key
+        lora1_preset, lora1_custom_url, lora1_hf_repo, lora1_hf_file, lora1_local_file, lora1_strength, token_to_use
     )
     if l1_path and l1_scale > 0:
         lora_configs.append((l1_path, l1_scale))
@@ -608,7 +621,7 @@ def generate_video(
 
     # 3. Slot 2 LoRA
     l2_path, l2_label, l2_scale = resolve_single_lora(
-        lora2_preset, lora2_custom_url, lora2_hf_repo, lora2_hf_file, lora2_local_file, lora2_strength, civitai_api_key
+        lora2_preset, lora2_custom_url, lora2_hf_repo, lora2_hf_file, lora2_local_file, lora2_strength, token_to_use
     )
     if l2_path and l2_scale > 0:
         lora_configs.append((l2_path, l2_scale))
@@ -728,17 +741,17 @@ all_preset_choices = (
     + (["Local File (loras/ folder)"] if get_local_loras() else [])
 )
 
-with gr.Blocks(css=custom_css, title="Wan 2.1 / 2.2 Video Studio") as app:
+with gr.Blocks(css=custom_css, title="Wan 2.2 Video Studio") as app:
     gr.HTML(
         """
         <div class="header-card">
             <div style="margin-bottom: 12px;">
                 <span class="badge badge-zerogpu">⚡ ZeroGPU</span>
-                <span class="badge badge-model">🎬 Wan 2.1 / 2.2 (Diffusers)</span>
+                <span class="badge badge-model">🎬 Wan 2.2 (MoE Diffusers)</span>
                 <span class="badge badge-multilora">🧩 Base NSFW + Multi-LoRA Engine</span>
             </div>
-            <h1>Wan 2.1 / 2.2 AI Video Studio</h1>
-            <p>Image-to-Video (I2V) & Text-to-Video (T2V) com Adaptador NSFW Base, Multi-LoRA e Resoluções Múltiplas de 16.</p>
+            <h1>Wan 2.2 AI Video Studio</h1>
+            <p>Image-to-Video (I2V) & Text-to-Video (T2V) com Arquitetura MoE Wan 2.2, Adaptador NSFW Base e Multi-LoRA.</p>
         </div>
         """
     )
@@ -759,7 +772,7 @@ with gr.Blocks(css=custom_css, title="Wan 2.1 / 2.2 Video Studio") as app:
                 value="deformed, bad anatomy, extra limbs, blurry, low resolution, bad quality, distortion, censorship",
             )
 
-            with gr.Accordion("📖 Guia & Modelos de Prompt HMNSFW / hmmotion (Wan 2.1 / 2.2)", open=False):
+            with gr.Accordion("📖 Guia & Modelos de Prompt HMNSFW / hmmotion (Wan 2.2)", open=False):
                 gr.Markdown(
                     """
                     **Estrutura Recomendada pelo Guia de 300 Horas / Autor do LoRA (`hmmotion`)**:
@@ -800,7 +813,7 @@ with gr.Blocks(css=custom_css, title="Wan 2.1 / 2.2 Video Studio") as app:
                     lora1_preset = gr.Dropdown(
                         label="LoRA Slot 1 Preset / Fonte",
                         choices=all_preset_choices,
-                        value="HMNSFW AIO V2 / hmmotion (Wan 2.1 / 2.2)",
+                        value="HMNSFW AIO V2 / hmmotion (Wan 2.2)",
                     )
                     with gr.Group(visible=False) as lora1_custom_url_grp:
                         lora1_custom_url = gr.Textbox(
@@ -816,7 +829,7 @@ with gr.Blocks(css=custom_css, title="Wan 2.1 / 2.2 Video Studio") as app:
 
                     lora1_trigger_display = gr.Textbox(
                         label="Trigger Words",
-                        value=LORA_PRESETS.get("HMNSFW AIO V2 / hmmotion (Wan 2.1 / 2.2)", {}).get("trigger_words", ""),
+                        value=LORA_PRESETS.get("HMNSFW AIO V2 / hmmotion (Wan 2.2)", {}).get("trigger_words", ""),
                         interactive=False,
                     )
                     add_lora1_triggers_btn = gr.Button("📋 Inserir Trigger Words no Prompt", elem_classes=["trigger-btn"])
@@ -867,12 +880,13 @@ with gr.Blocks(css=custom_css, title="Wan 2.1 / 2.2 Video Studio") as app:
                     model_choice = gr.Dropdown(
                         label="Modelo Base Wan",
                         choices=[
-                            ("Wan 2.1 I2V 14B 480P (Recomendado ZeroGPU)", "Wan-AI/Wan2.1-I2V-14B-480P-Diffusers"),
-                            ("Wan 2.1 I2V 14B 720P (Alta Definição)", "Wan-AI/Wan2.1-I2V-14B-720P-Diffusers"),
-                            ("Wan 2.1 T2V 1.3B (Ultra Rápido)", "Wan-AI/Wan2.1-T2V-1.3B-Diffusers"),
-                            ("Wan 2.1 T2V 14B (Texto para Vídeo)", "Wan-AI/Wan2.1-T2V-14B-Diffusers"),
+                            ("Wan 2.2 I2V A14B 480P (MoE - Recomendado ZeroGPU)", "Wan-AI/Wan2.2-I2V-A14B-480P-Diffusers"),
+                            ("Wan 2.2 I2V A14B 720P (MoE Alta Definição)", "Wan-AI/Wan2.2-I2V-A14B-720P-Diffusers"),
+                            ("Wan 2.2 TI2V 5B (Híbrido Ultra Rápido)", "Wan-AI/Wan2.2-TI2V-5B-Diffusers"),
+                            ("Wan 2.2 T2V A14B (Texto para Vídeo MoE)", "Wan-AI/Wan2.2-T2V-A14B-Diffusers"),
+                            ("Wan 2.1 I2V 14B 480P (Versão Anterior)", "Wan-AI/Wan2.1-I2V-14B-480P-Diffusers"),
                         ],
-                        value="Wan-AI/Wan2.1-I2V-14B-480P-Diffusers",
+                        value="Wan-AI/Wan2.2-I2V-A14B-480P-Diffusers",
                     )
                     canvas = gr.Dropdown(
                         label="Proporção & Resolução (Múltiplos de 16)",
@@ -917,12 +931,13 @@ with gr.Blocks(css=custom_css, title="Wan 2.1 / 2.2 Video Studio") as app:
                     randomize_seed = gr.Checkbox(label="🎲 Randomizar Seed", value=True)
 
                 civitai_api_key = gr.Textbox(
-                    label="🔑 Civitai API Key (Opcional)",
-                    placeholder="Cole seu token Civitai se baixar modelos restritos/NSFW direto do civitai.com (ou adicione CIVITAI_API_KEY no Space Secrets)",
+                    label="🔑 Civitai API Key",
+                    value=DEFAULT_CIVITAI_KEY,
+                    placeholder="Chave de API do Civitai configurada",
                     type="password",
                 )
 
-            generate_btn = gr.Button("🚀 Gerar Vídeo Wan 2.1", variant="primary", elem_classes=["generate-btn"])
+            generate_btn = gr.Button("🚀 Gerar Vídeo Wan 2.2", variant="primary", elem_classes=["generate-btn"])
 
         with gr.Column(scale=6):
             output_video = gr.Video(label="Vídeo Gerado", autoplay=True, loop=True)