Update app.py

app.py

@@ -43,10 +43,10 @@ STYLE_PRESETS = {
     "Artistic": "artistic style, creative composition, unique visual style, expressive animation, stylized rendering"
 }
 
-# 固定模型配置 - 使用您的私人NSFW版本
-NSFW_CHECKPOINT_URL = "https://huggingface.co/alexander00001/NSFW_Wan_14b/resolve/main/nsfw_wan_14B_e15.safetensors"
-# 使用CogVideoX作为基础配置，因为Wan很可能基于CogVideoX架构  
-BASE_CONFIG_MODEL = "THUDM/CogVideoX-5b"  # 用于获取配置信息
+# 固定模型配置 - 使用您的完整私人仓库（添加配置文件后）
+PRIVATE_MODEL = "alexander00001/NSFW_Wan_14b"
+# 备用官方模型
+FALLBACK_MODEL = "THUDM/CogVideoX-5b"
 
 # 质量增强提示词 - 适配视频
 QUALITY_ENHANCERS = [
@@ -116,49 +116,43 @@ def initialize_model():
         device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
         print(f"🖥️ Using device: {device}")
         
-        print(f"📦 Loading NSFW Wan T2V checkpoint: wan_14B_e15.safetensors")
-        print(f"🔧 Using CogVideoX config from: {BASE_CONFIG_MODEL}")
+        print(f"Loading Private NSFW Model: {PRIVATE_MODEL}")
+        print(f"Fallback Model: {FALLBACK_MODEL}")
         
-        # 方法1: 尝试使用CogVideoXPipeline加载（最可能成功）
+        # 首先尝试加载您的私人NSFW模型（完整仓库结构）
         try:
-            from diffusers import CogVideoXPipeline
-            pipeline = CogVideoXPipeline.from_single_file(
-                NSFW_CHECKPOINT_URL,
-                config=BASE_CONFIG_MODEL,
+            # 使用WanPipeline而不是CogVideoXPipeline
+            from diffusers import WanPipeline
+            pipeline = WanPipeline.from_pretrained(
+                PRIVATE_MODEL,
                 torch_dtype=torch.float16 if torch.cuda.is_available() else torch.float32,
                 use_safetensors=True,
-                safety_checker=None,
-                requires_safety_checker=False
+                trust_remote_code=True  # 私人仓库需要
             )
-            print("✅ Successfully loaded with CogVideoXPipeline.from_single_file()")
-        except Exception as cogvideo_error:
-            print(f"⚠️ CogVideoX loading failed: {cogvideo_error}")
+            print("Successfully loaded private NSFW Wan model!")
             
-            # 方法2: 尝试通用DiffusionPipeline
+        except Exception as private_error:
+            print(f"Private Wan model loading failed: {private_error}")
+            print(f"Falling back to official model: {FALLBACK_MODEL}")
+            
+            # 备选：尝试官方Wan2.2-Diffusers版本
             try:
-                pipeline = DiffusionPipeline.from_single_file(
-                    NSFW_CHECKPOINT_URL,
-                    config=BASE_CONFIG_MODEL,
+                pipeline = WanPipeline.from_pretrained(
+                    "Wan-AI/Wan2.2-T2V-A14B-Diffusers",
                     torch_dtype=torch.float16 if torch.cuda.is_available() else torch.float32,
-                    use_safetensors=True,
-                    safety_checker=None,
-                    requires_safety_checker=False,
-                    trust_remote_code=True
+                    use_safetensors=True
                 )
-                print("✅ Successfully loaded with DiffusionPipeline.from_single_file()")
-            except Exception as diffusion_error:
-                print(f"⚠️ DiffusionPipeline single file loading failed: {diffusion_error}")
-                
-                # 方法3: 最后备选 - 直接使用官方CogVideoX（非NSFW）
-                print("🔄 Falling back to official CogVideoX model (non-NSFW)...")
+                print("Loaded official Wan2.2-Diffusers model")
+            except Exception as wan_error:
+                print(f"Official Wan loading failed: {wan_error}")
+                # 最后备选：CogVideoX
+                from diffusers import CogVideoXPipeline
                 pipeline = CogVideoXPipeline.from_pretrained(
-                    BASE_CONFIG_MODEL,
+                    FALLBACK_MODEL,
                     torch_dtype=torch.float16 if torch.cuda.is_available() else torch.float32,
-                    use_safetensors=True,
-                    safety_checker=None,
-                    requires_safety_checker=False
+                    use_safetensors=True
                 )
-                print("✅ Loaded official CogVideoX as fallback (non-NSFW version)")
+                print("Loaded CogVideoX as final fallback")
         
         pipeline = pipeline.to(device)
         
@@ -868,9 +862,9 @@ def create_interface():
 # ===== 启动应用 =====
 if __name__ == "__main__":
     print("🎬 Starting NSFW Video Generator...")
-    print(f"🔧 NSFW Checkpoint: {NSFW_CHECKPOINT_URL}")
-    print(f"🔧 Base Config: {BASE_CONFIG_MODEL} (CogVideoX-5b)")
-    print("🔧 Using CogVideoXPipeline.from_single_file() method")
+    print(f"Private NSFW Model: {PRIVATE_MODEL}")
+    print(f"Fallback Model: {FALLBACK_MODEL}")
+    print("Using complete repository structure for proper loading")
     print(f"🔧 Default Duration: {VIDEO_CONFIG['default_duration']}s")
     print(f"🔧 Default Resolution: {VIDEO_CONFIG['default_width']}×{VIDEO_CONFIG['default_height']}")
     print(f"🔧 Spaces GPU: {'✅ Available' if SPACES_AVAILABLE else '❌ Not Available'}")