Update model.py

model.py

@@ -129,23 +129,24 @@ class ModelHandler:
         # 5. Load Adapters
         print("Loading Adapters...")
         
-        # 5a. IP-Adapter (for InstantID)
-        ip_adapter_filename = "ip-adapter.bin"
-        ip_adapter_local_path = os.path.join("./models", ip_adapter_filename)
-        if not os.path.exists(ip_adapter_local_path):
+        # --- FIX: We must FUSE LoRAs in order to avoid TCD/Style adapter conflict ---
+
+        # 5a. Load and Fuse Style LoRA (lucasart)
+        print(f"Loading and Fusing Style LoRA ({Config.LORA_FILENAME})...")
+        style_lora_path = os.path.join("./models", Config.LORA_FILENAME)
+        if not os.path.exists(style_lora_path):
             hf_hub_download(
-                repo_id=Config.INSTANTID_REPO,
-                filename=ip_adapter_filename,
+                repo_id=Config.REPO_ID,
+                filename=Config.LORA_FILENAME,
                 local_dir="./models",
                 local_dir_use_symlinks=False
             )
-        self.pipeline.load_ip_adapter_instantid(ip_adapter_local_path)
-        print("  [OK] IP-Adapter loaded.")
-        
-        # --- FIX: Load LoRAs with adapter_name, DO NOT FUSE ---
-        
-        # 5b. TCD LoRA (for speed)
-        print("Loading TCD-SDXL-LoRA...")
+        self.pipeline.load_lora_weights("./models", weight_name=Config.LORA_FILENAME)
+        self.pipeline.fuse_lora(lora_scale=Config.LORA_STRENGTH)
+        print("  [OK] Style LoRA fused.")
+
+        # 5b. Load and Fuse TCD LoRA (for speed)
+        print("Loading and Fusing TCD-SDXL-LoRA...")
         tcd_lora_filename = "pytorch_lora_weights.safetensors"
         tcd_lora_path = os.path.join("./models", tcd_lora_filename)
         if not os.path.exists(tcd_lora_path):
@@ -155,28 +156,23 @@ class ModelHandler:
                 local_dir="./models",
                 local_dir_use_symlinks=False
             )
-        # Load with adapter_name="tcd"
-        self.pipeline.load_lora_weights("./models", weight_name=tcd_lora_filename, adapter_name="tcd")
-        print("  [OK] TCD LoRA loaded.")
+        self.pipeline.load_lora_weights("./models", weight_name=tcd_lora_filename)
+        self.pipeline.fuse_lora(lora_scale=1.0) # TCD must be fused at 1.0
+        print("  [OK] TCD LoRA fused.")
 
-        # 5c. Style LoRA (lucasart)
-        print(f"Loading Style LoRA ({Config.LORA_FILENAME})...")
-        style_lora_path = os.path.join("./models", Config.LORA_FILENAME)
-        if not os.path.exists(style_lora_path):
+        # 5c. Load IP-Adapter (for InstantID) - *Must be loaded AFTER fusing*
+        ip_adapter_filename = "ip-adapter.bin"
+        ip_adapter_local_path = os.path.join("./models", ip_adapter_filename)
+        if not os.path.exists(ip_adapter_local_path):
             hf_hub_download(
-                repo_id=Config.REPO_ID,
-                filename=Config.LORA_FILENAME,
+                repo_id=Config.INSTANTID_REPO,
+                filename=ip_adapter_filename,
                 local_dir="./models",
                 local_dir_use_symlinks=False
             )
-        # Load with adapter_name="style"
-        self.pipeline.load_lora_weights("./models", weight_name=Config.LORA_FILENAME, adapter_name="style")
-        print("  [OK] Style LoRA loaded.")
+        self.pipeline.load_ip_adapter_instantid(ip_adapter_local_path)
+        print("  [OK] IP-Adapter loaded.")
         
-        # 6. Set Adapter Weights (TCD + Style)
-        # This correctly activates both LoRAs simultaneously
-        print(f"Setting adapter weights: TCD (1.0), Style ({Config.LORA_STRENGTH})")
-        self.pipeline.set_adapters(["tcd", "style"], adapter_weights=[1.0, Config.LORA_STRENGTH])
         # --- END FIX ---
 
         # 7. Load Preprocessors