no unmerging

app.py

@@ -162,6 +162,12 @@ class VideoCoF_Controller(Wan_Controller):
         if self.lora_model_path != lora_model_dropdown:
             self.update_lora_model(lora_model_dropdown)
 
+        # Track whether LoRAs are already merged to avoid repeat merges/unmerges.
+        if not hasattr(self, "_active_lora_path"):
+            self._active_lora_path = None
+        if not hasattr(self, "_acc_lora_active"):
+            self._acc_lora_active = False
+
         # Scheduler setup
         scheduler_config = self.pipeline.scheduler.config
         if sampler_dropdown in ["Flow_Unipc", "Flow_DPM++"]:
@@ -171,18 +177,34 @@ class VideoCoF_Controller(Wan_Controller):
         # LoRA merging
         # 1. Merge VideoCoF LoRA
         if self.lora_model_path != "none":
-            print(f"Merge VideoCoF Lora: {self.lora_model_path}")
-            self.pipeline = merge_lora(self.pipeline, self.lora_model_path, multiplier=lora_alpha_slider, device=self.device)
+            # If a different LoRA was previously merged, unmerge it first.
+            if self._active_lora_path and self._active_lora_path != self.lora_model_path:
+                print(f"Unmerging previous VideoCoF LoRA: {self._active_lora_path}")
+                self.pipeline = unmerge_lora(self.pipeline, self._active_lora_path, multiplier=lora_alpha_slider, device=self.device)
+                self._active_lora_path = None
+
+            if self._active_lora_path != self.lora_model_path:
+                print(f"Merge VideoCoF LoRA: {self.lora_model_path}")
+                self.pipeline = merge_lora(self.pipeline, self.lora_model_path, multiplier=lora_alpha_slider, device=self.device)
+                self._active_lora_path = self.lora_model_path
 
         # 2. Merge Acceleration LoRA (FusionX) if enabled
         acc_lora_path = os.path.join(self.personalized_model_dir, "Wan2.1_Text_to_Video_14B_FusionX_LoRA.safetensors")
         if enable_acceleration:
             if os.path.exists(acc_lora_path):
-                print(f"Merge Acceleration LoRA: {acc_lora_path}")
-                # FusionX LoRA generally uses multiplier 1.0
-                self.pipeline = merge_lora(self.pipeline, acc_lora_path, multiplier=1.0, device=self.device)
+                if not self._acc_lora_active:
+                    print(f"Merge Acceleration LoRA: {acc_lora_path}")
+                    # FusionX LoRA generally uses multiplier 1.0
+                    self.pipeline = merge_lora(self.pipeline, acc_lora_path, multiplier=1.0, device=self.device)
+                    self._acc_lora_active = True
             else:
                 print(f"Warning: Acceleration LoRA not found at {acc_lora_path}")
+        else:
+            # If it was previously merged but now disabled, unmerge once.
+            if self._acc_lora_active and os.path.exists(acc_lora_path):
+                print("Unmerging Acceleration LoRA (disabled)")
+                self.pipeline = unmerge_lora(self.pipeline, acc_lora_path, multiplier=1.0, device=self.device)
+                self._acc_lora_active = False
 
         # Seed
         if int(seed_textbox) != -1 and seed_textbox != "": 
@@ -247,24 +269,17 @@ class VideoCoF_Controller(Wan_Controller):
         except Exception as e:
             print(f"Error: {e}")
             # Unmerge in case of error (LIFO order)
-            if enable_acceleration and os.path.exists(acc_lora_path):
+            if self._acc_lora_active and os.path.exists(acc_lora_path):
                  print("Unmerging Acceleration LoRA (due to error)")
                  self.pipeline = unmerge_lora(self.pipeline, acc_lora_path, multiplier=1.0, device=self.device)
+                 self._acc_lora_active = False
             
-            if self.lora_model_path != "none":
+            if self._active_lora_path:
                  print("Unmerging VideoCoF LoRA (due to error)")
-                 self.pipeline = unmerge_lora(self.pipeline, self.lora_model_path, multiplier=lora_alpha_slider, device=self.device)
+                 self.pipeline = unmerge_lora(self.pipeline, self._active_lora_path, multiplier=lora_alpha_slider, device=self.device)
+                 self._active_lora_path = None
             return gr.update(), gr.update(), f"Error: {str(e)}"
 
-        # Unmerge LoRAs (LIFO order)
-        if enable_acceleration and os.path.exists(acc_lora_path):
-            print("Unmerging Acceleration LoRA")
-            self.pipeline = unmerge_lora(self.pipeline, acc_lora_path, multiplier=1.0, device=self.device)
-
-        if self.lora_model_path != "none":
-            print("Unmerging VideoCoF LoRA")
-            self.pipeline = unmerge_lora(self.pipeline, self.lora_model_path, multiplier=lora_alpha_slider, device=self.device)
-
         # Save output
         save_sample_path = self.save_outputs(
             False, length_slider, final_video, fps=fps

videox_fun/ui/ui.py

@@ -291,8 +291,7 @@ def create_generation_method(source_method_options, prompt_textbox, support_end_
             gr.Examples(
                 examples=video_examples,
                 inputs=[validation_video, prompt_textbox] if len(video_examples[0]) > 1 else validation_video,
-                label="Video Examples",
-                examples_per_page=6,
+                label="Video Examples"
             )
 
         # Removed Mask Accordion entirely per request or hidden. User said "mask这个不需要"