Rework custom LoRA to a single URL box + Download & Verify button: paste an HF repo link or direct .safetensors link, download/verify/load on button press, apply on Generate

app.py

@@ -1137,6 +1137,67 @@ def _ensure_custom_lora_loaded(repo, file):
     print(f"[gen] custom LoRA {repo}/{file} parsed ({len(_loaded)} modules)", flush=True)
 
 
+def _parse_hf_link(url):
+    """Parse a Hugging Face repo or file link into (repo, file). `file` is None for a bare repo link."""
+    url = (url or "").strip().split("?")[0].split("#")[0]
+    if not url:
+        raise gr.Error("Paste a Hugging Face link first.")
+    if not url.startswith("http"):
+        parts = [p for p in url.split("/") if p]
+        if len(parts) >= 2:
+            return parts[0] + "/" + parts[1], "/".join(parts[2:]) or None
+        raise gr.Error(f"Couldn't parse `{url}` as a Hugging Face repo link.")
+    if "huggingface.co" not in url:
+        raise gr.Error("Only Hugging Face links are supported (huggingface.co).")
+    parts = [p for p in url.split("huggingface.co", 1)[1].strip("/").split("/") if p]
+    if len(parts) < 2:
+        raise gr.Error(f"Couldn't parse `{url}` as a Hugging Face repo link.")
+    repo = parts[0] + "/" + parts[1]
+    if len(parts) == 2:
+        return repo, None
+    if parts[2] in ("resolve", "tree", "blob"):
+        if len(parts) < 5:
+            raise gr.Error(f"Couldn't parse a filename from `{url}`.")
+        if parts[3] != "main":
+            raise gr.Error("Only `main`-branch links are supported — use a `resolve/main/...` link.")
+        return repo, "/".join(parts[4:])
+    return repo, "/".join(parts[2:])
+
+
+def _resolve_repo_file(repo):
+    """Pick the single .safetensors file of a repo link; error if there isn't exactly one."""
+    from huggingface_hub import list_repo_files
+    try:
+        files = [f for f in list_repo_files(repo) if f.endswith(".safetensors")]
+    except Exception as _e:
+        raise gr.Error(f"Couldn't list files in `{repo}`: {_e}")
+    if len(files) == 1:
+        return files[0]
+    if not files:
+        raise gr.Error(f"No .safetensors files found in `{repo}`.")
+    raise gr.Error(f"`{repo}` has multiple .safetensors files — paste a direct file link instead: "
+                   + ", ".join(files[:5]) + ("…" if len(files) > 5 else ""))
+
+
+def _download_custom_lora(url, scale=1.0, trigger=""):
+    """Download + verify a user-supplied Hugging Face LoRA and report status. Loads it for the next Generate."""
+    try:
+        repo, file = _parse_hf_link(url)
+        if file is None:
+            file = _resolve_repo_file(repo)
+        _ensure_custom_lora_loaded(repo, file)
+    except gr.Error as _e:
+        return gr.update(value=f"**❌ {_e}**", visible=True)
+    except Exception as _e:
+        return gr.update(value=f"**❌ Unexpected error loading the LoRA: {_e}**", visible=True)
+    n = len(_CUSTOM_LoRA[(repo, file)])
+    note = f" (scale {scale:g}" + (f", trigger `{trigger}`)" if trigger else ")")
+    return gr.update(
+        value=f"**✅ Loaded `{repo}/{file}`** — {n} modules, will apply on Generate{note}.",
+        visible=True,
+    )
+
+
 def _apply_lora(key, scale, store, merged):
     """Merge a loaded LoRA into transformer weights on GPU. Lazy CUDA transfer of A/B factors."""
     if key in merged or key not in store:
@@ -1409,9 +1470,9 @@ def _generate(prompt_embeds, text_token_tags, image, last_image, height, width,
     return state.get("videos")[0], state.get("audio")[0].cpu(), state.get("sampling_rate")
 
 
-def generate(prompt, image_path=None, last_image_path=None, canvas=DEFAULT_CANVAS, duration=5, steps=25, seed=-1, upsample=False, turbo=False, nsfw_lora_keys=(), custom_loras=(), progress=gr.Progress(track_tqdm=True)):
+def generate(prompt, image_path=None, last_image_path=None, canvas=DEFAULT_CANVAS, duration=5, steps=25, seed=-1, upsample=False, turbo=False, nsfw_lora_keys=(), custom_lora_url="", custom_lora_scale=1.0, custom_lora_trigger="", progress=gr.Progress(track_tqdm=True)):
     """One request. `upsample` is last among the pre-existing positional args, so a positional API client that
-    predates it is unaffected; `custom_loras` comes after it."""
+    predates it is unaffected; the custom-LoRA args come after it."""
     if LOAD_ERROR:
         raise gr.Error(LOAD_ERROR)
     if PIPE is None:
@@ -1431,27 +1492,22 @@ def generate(prompt, image_path=None, last_image_path=None, canvas=DEFAULT_CANVA
     # LoRAs the user selected via the catalog dropdown; the AIO motion adapter is auto-loaded whenever any is on.
     nsfw_keys = tuple(k for k in (nsfw_lora_keys or ()) if k in NSFW_LORA_CONFIGS)
 
-    # User-supplied LoRAs from the custom table: rows are [repo, file, scale, trigger].
+    # User-supplied LoRA from the custom URL box: parse the link and require it was downloaded & verified.
     custom = []
-    for _row in (custom_loras or ()):
-        if not isinstance(_row, (list, tuple)) or not _row:
-            continue
-        _repo = str(_row[0] or "").strip()
-        _file = str(_row[1] or "").strip()
-        if not _repo and not _file:
-            continue  # fully empty row
-        if not _repo or not _file:
-            raise gr.Error("Each custom LoRA row needs both an HF repo and a filename.")
+    if custom_lora_url and str(custom_lora_url).strip():
+        _repo, _file = _parse_hf_link(custom_lora_url)
+        if _file is None:
+            _file = _resolve_repo_file(_repo)
+        if (_repo, _file) not in _CUSTOM_LoRA:
+            raise gr.Error(f"`{_repo}/{_file}` isn't downloaded yet — press 'Download & Verify' first.")
         try:
-            _scale = float(_row[2]) if _row[2] not in (None, "") else 1.0
+            _scale = float(custom_lora_scale) if custom_lora_scale not in (None, "") else 1.0
         except (TypeError, ValueError):
-            raise gr.Error(f"Custom LoRA scale for `{_repo}/{_file}` must be a number.")
+            raise gr.Error("Custom LoRA scale must be a number.")
         if not 0.01 <= _scale <= 4.0:
-            raise gr.Error(f"Custom LoRA scale for `{_repo}/{_file}` must be between 0.01 and 4.")
-        _trigger = str(_row[3] or "").strip() if len(_row) > 3 else ""
-        custom.append((_repo, _file, _scale, _trigger))
-    _seen = set()
-    custom = [c for c in custom if not (c[0], c[1]) in _seen and not _seen.add((c[0], c[1]))]
+            raise gr.Error("Custom LoRA scale must be between 0.01 and 4.")
+        _trigger = str(custom_lora_trigger or "").strip()
+        custom = [(_repo, _file, _scale, _trigger)]
 
     if nsfw_keys or custom:
         nsfw_keys += ("nsfw_aio",)
@@ -1461,7 +1517,6 @@ def generate(prompt, image_path=None, last_image_path=None, canvas=DEFAULT_CANVA
         # The trigger token must be in the prompt text for the conditioner to encode the LoRA's concept.
         prompt = f"{prompt}, {NSFW_LORA_CONFIGS[_key]['trigger']}"
     for _repo, _file, _scale, _trigger in custom:
-        _ensure_custom_lora_loaded(_repo, _file)
         if _trigger:
             prompt = f"{prompt}, {_trigger}"
 
@@ -1860,20 +1915,20 @@ with gr.Blocks(title="minimax h3 turbo + lora's") as demo:
                     info="Searchable — type to filter. Selected LoRAs show as removable tags; their trigger tokens are auto-appended to the prompt. The HMNSFW AIO motion adapter auto-loads whenever any LoRA is selected.",
                 )
                 lora_desc = gr.Markdown(visible=False)
-            with gr.Accordion("Custom LoRAs (Hugging Face)", open=False):
-                gr.Markdown("Load your own MiniMax-H3 LoRA from any public Hugging Face repo — one row per LoRA. "
-                            "Repo like `EllaPriest45/MinimaxH3_Actions`, file like "
-                            "`Blowjob v3.0 - MinimaxH3 - bl0w_j0b.safetensors`. Scale 0.5–1.5 is typical; "
-                            "trigger is optional and auto-appended to the prompt if given. "
+            with gr.Accordion("Custom LoRA (Hugging Face)", open=False):
+                gr.Markdown("Paste a Hugging Face link — a repo page or a direct `.safetensors` file link — then press "
+                            "**Download & Verify**. The verified LoRA is applied on Generate. "
                             "ComfyUI and kohya formats are auto-detected.")
-                custom_lora_df = gr.Dataframe(
-                    headers=["HF repo", "File", "Scale", "Trigger (optional)"],
-                    datatype=["str", "str", "number", "str"],
-                    value=[["", "", 1.0, ""]],
-                    type="array",
-                    interactive=True,
-                    row_count=(1, "dynamic"),
+                custom_lora_url = gr.Textbox(
+                    label="HF repo or .safetensors link",
+                    placeholder="https://huggingface.co/Owner/Repo  or  https://huggingface.co/Owner/Repo/resolve/main/file.safetensors",
                 )
+                with gr.Row():
+                    custom_lora_scale = gr.Number(label="Scale", value=1.0, minimum=0.01, maximum=4.0, step=0.1)
+                    custom_lora_trigger = gr.Textbox(label="Trigger (optional)",
+                                                     placeholder="Auto-appended to the prompt if given")
+                custom_lora_btn = gr.Button("Download & Verify", size="sm")
+                custom_lora_status = gr.Markdown(visible=False)
             with gr.Row():
                 image = gr.Image(label="First frame (optional)", type="filepath")
                 last_image = gr.Image(label="Last frame (optional)", type="filepath")
@@ -1900,11 +1955,16 @@ with gr.Blocks(title="minimax h3 turbo + lora's") as demo:
 
     run.click(
         generate,
-        [prompt, image, last_image, canvas, duration, steps, seed, upsample, turbo, nsfw_lora_keys, custom_lora_df],
+        [prompt, image, last_image, canvas, duration, steps, seed, upsample, turbo, nsfw_lora_keys,
+         custom_lora_url, custom_lora_scale, custom_lora_trigger],
         [video, report, upsampled, upsampled_panel, download_btn, lora_label],
         api_name="generate",
     )
 
+    custom_lora_btn.click(_download_custom_lora,
+                          [custom_lora_url, custom_lora_scale, custom_lora_trigger],
+                          [custom_lora_status])
+
     nsfw_lora_keys.change(_lora_descriptions, [nsfw_lora_keys], [lora_desc])
 
     last_frame_btn.click(