Fix scheduler dropdown: include checkpoint in choices before load

app.py

@@ -111,19 +111,15 @@ def _scheduler_config(profile, pipe=None):
             interactive=False,
             info="Uses the checkpoint scheduler (custom, not swappable until loaded)",
         )
-    if pipe is None:
-        choices = scheduler_choices_for_profile(profile)
-        return gr.update(
-            choices=choices,
-            value="checkpoint",
-            interactive=not uses_native_scheduler(profile),
-            info="Defaults to checkpoint scheduler after Load model; optional built-in swap",
-        )
     return gr.update(
         choices=choices,
         value=default,
         interactive=not uses_native_scheduler(profile),
-        info="Checkpoint scheduler by default; pick another built-in diffusers scheduler to swap",
+        info=(
+            "Checkpoint scheduler by default; pick another built-in diffusers scheduler to swap"
+            if pipe is not None
+            else "Defaults to checkpoint scheduler after Load model; optional built-in swap"
+        ),
     )
 
 
@@ -349,7 +345,7 @@ def generate(
 def build_demo() -> gr.Blocks:
     g_start, g_end = _interval_defaults(DEFAULT_PROFILE)
     extras = DEFAULT_PROFILE.extra_call_kwargs
-    default_scheduler_choices = scheduler_choices_for_profile(DEFAULT_PROFILE)
+    default_scheduler_choices = ["checkpoint", *scheduler_choices_for_profile(DEFAULT_PROFILE)]
     default_scheduler_value = "checkpoint"
 
     with gr.Blocks(title="BiliSakura Visual Generation Models") as demo:

model_loader.py

@@ -170,15 +170,15 @@ def scheduler_options_for_profile(profile: ModelProfile, pipe: DiffusionPipeline
             return [name], name
         return ["checkpoint"], "checkpoint"
 
+    swappable = scheduler_choices_for_profile(profile)
     if pipe is not None:
         loaded = current_scheduler_name(pipe)
-        choices = scheduler_choices_for_profile(profile)
+        choices = list(swappable)
         if loaded not in choices:
             choices = [loaded, *choices]
         return choices, loaded
 
-    choices = scheduler_choices_for_profile(profile)
-    return choices, "checkpoint"
+    return ["checkpoint", *swappable], "checkpoint"
 
 
 def swap_scheduler(pipe: DiffusionPipeline, scheduler_name: str, profile: ModelProfile) -> None: