Update app.py

app.py

@@ -18,6 +18,8 @@ MODEL_DIR = os.path.abspath("ckpts")
 # Repositories
 HF_MAIN_REPO = "tencent/HunyuanVideo-1.5"
 HF_GLYPH_REPO = "multimodalart/glyph-sdxl-v2-byt5-small"
+HF_LLM_REPO = "Qwen/Qwen2.5-VL-7B-Instruct"
+HF_VISION_REPO = "black-forest-labs/FLUX.1-Redux-dev" # User specified
 
 # Configuration
 TRANSFORMER_VERSION = "480p_i2v_distilled"
@@ -38,7 +40,7 @@ def setup_environment():
     if REPO_DIR not in sys.path:
         sys.path.insert(0, REPO_DIR)
 
-    # 3. Download Main Weights
+    # 3. Download Main Weights (Transformer, VAE, Scheduler)
     os.makedirs(MODEL_DIR, exist_ok=True)
     target_transformer = os.path.join(MODEL_DIR, "transformer", TRANSFORMER_VERSION)
     
@@ -49,8 +51,6 @@ def setup_environment():
             allow_patterns = [
                 f"transformer/{TRANSFORMER_VERSION}/*",
                 "vae/*",
-                "text_encoder/*",
-                "vision_encoder/*",
                 "scheduler/*",
                 "tokenizer/*"
             ]
@@ -64,8 +64,35 @@ def setup_environment():
             print(f"Error downloading main weights: {e}")
             sys.exit(1)
 
-    # 4. Download & Restructure Glyph Weights
-    # The pipeline expects: ckpts/text_encoder/Glyph-SDXL-v2/checkpoints/byt5_model.pt
+    # 4. Download LLM Text Encoder (Qwen)
+    llm_target = os.path.join(MODEL_DIR, "text_encoder", "llm")
+    if not os.path.exists(llm_target) or not os.listdir(llm_target):
+        print(f"Downloading LLM Text Encoder from {HF_LLM_REPO}...")
+        try:
+            from huggingface_hub import snapshot_download
+            snapshot_download(
+                repo_id=HF_LLM_REPO,
+                local_dir=llm_target,
+                local_dir_use_symlinks=False
+            )
+        except Exception as e:
+            print(f"Error downloading LLM: {e}")
+
+    # 5. Download Vision Encoder (SigLIP)
+    vision_target = os.path.join(MODEL_DIR, "vision_encoder", "siglip")
+    if not os.path.exists(vision_target) or not os.listdir(vision_target):
+        print(f"Downloading Vision Encoder from {HF_VISION_REPO}...")
+        try:
+            from huggingface_hub import snapshot_download
+            snapshot_download(
+                repo_id=HF_VISION_REPO,
+                local_dir=vision_target,
+                local_dir_use_symlinks=False
+            )
+        except Exception as e:
+            print(f"Error downloading Vision Encoder: {e}")
+
+    # 6. Download & Restructure Glyph Weights
     glyph_root = os.path.join(MODEL_DIR, "text_encoder", "Glyph-SDXL-v2")
     glyph_ckpt_target = os.path.join(glyph_root, "checkpoints", "byt5_model.pt")
     
@@ -73,48 +100,31 @@ def setup_environment():
         print(f"Downloading & Structuring Glyph Weights from {HF_GLYPH_REPO}...")
         try:
             from huggingface_hub import snapshot_download
-            # Download to a temp folder first
             glyph_temp = os.path.join(MODEL_DIR, "glyph_temp")
-            snapshot_download(
-                repo_id=HF_GLYPH_REPO,
-                local_dir=glyph_temp,
-                local_dir_use_symlinks=False
-            )
+            snapshot_download(repo_id=HF_GLYPH_REPO, local_dir=glyph_temp, local_dir_use_symlinks=False)
             
-            # Create target structure
             os.makedirs(os.path.join(glyph_root, "assets"), exist_ok=True)
             os.makedirs(os.path.join(glyph_root, "checkpoints"), exist_ok=True)
             
-            # Move Assets (color_idx.json, etc.)
+            # Move Assets
             src_assets = os.path.join(glyph_temp, "assets")
             if os.path.exists(src_assets):
                 for f in os.listdir(src_assets):
                     shutil.copy(os.path.join(src_assets, f), os.path.join(glyph_root, "assets", f))
             
-            # Move & Rename Model (pytorch_model.bin -> byt5_model.pt)
-            # Try bin first, then safetensors (code usually loads via torch.load, so bin/pt is safer)
+            # Move Model
             src_bin = os.path.join(glyph_temp, "pytorch_model.bin")
             if os.path.exists(src_bin):
-                print(" moving pytorch_model.bin -> byt5_model.pt")
                 shutil.move(src_bin, glyph_ckpt_target)
             else:
-                # Fallback if repo changes structure
-                print("Warning: pytorch_model.bin not found, looking for safetensors...")
                 src_safe = os.path.join(glyph_temp, "model.safetensors")
                 if os.path.exists(src_safe):
-                     # Note: Standard torch.load might fail on safetensors if code expects pickle, 
-                     # but let's try.
                      shutil.move(src_safe, glyph_ckpt_target)
             
-            # Clean up temp
             shutil.rmtree(glyph_temp, ignore_errors=True)
-            print("Glyph setup complete.")
             
         except Exception as e:
             print(f"Error setting up Glyph weights: {e}")
-            # Don't exit, maybe the model can run without it if config tweaked, 
-            # but likely it will fail later.
-            pass
 
     print("Environment Ready.")
     print("=" * 50)