From 57259ded0a81ce01b7f17b9ec9704fa7ebec6945 Mon Sep 17 00:00:00 2001
From: Daniel Han <danielhanchen@gmail.com>
Date: Mon, 6 Jul 2026 15:53:52 +0000
Subject: [PATCH] Match Wan generation-defaults key as a name segment, not a
 raw substring

---
 .../backend/core/inference/video_families.py   |  7 ++++++-
 studio/backend/tests/test_video_families.py    | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/studio/backend/core/inference/video_families.py b/studio/backend/core/inference/video_families.py
index 835b968bc3..ca9cc4a914 100644
--- a/studio/backend/core/inference/video_families.py
+++ b/studio/backend/core/inference/video_families.py
@@ -292,6 +292,11 @@ def default_video_generation_params(
     for identifier in identifiers:
         needle = (identifier or "").lower()
         for key, steps, guidance in _VIDEO_GENERATION_DEFAULTS:
-            if key in needle:
+            # Match the key as a name segment, not a raw substring: reject a
+            # preceding ASCII letter so an opaque path/repo like "user/swan-video"
+            # or "taiwan-clips" does not false-match "wan" and silently apply Wan's
+            # 50-step/CFG-5 schedule to a non-Wan model. Trailing chars stay free so
+            # "wan2.2-ti2v", "ltxv-2.3" and "...-distilled-..." still match.
+            if re.search(r"(?<![a-z])" + re.escape(key), needle):
                 return steps, guidance
     return fallback
diff --git a/studio/backend/tests/test_video_families.py b/studio/backend/tests/test_video_families.py
index fa1ef242e9..628b6e44b6 100644
--- a/studio/backend/tests/test_video_families.py
+++ b/studio/backend/tests/test_video_families.py
@@ -193,6 +193,24 @@ def test_generation_defaults_fallback_honors_family():
     assert default_video_generation_params("wan2.2-ti2v-5b", fallback = (8, 1.0)) == (50, 5.0)
 
 
+def test_generation_defaults_wan_is_segment_not_substring():
+    # "wan" must match as a name segment, not a raw substring, so an opaque non-Wan
+    # repo/path whose name merely contains the letters "wan" ("swan", "taiwan") does
+    # NOT silently pick up Wan's 50-step/CFG-5 schedule ahead of its canonical base repo.
+    assert default_video_generation_params(
+        "user/swan-video", "Lightricks/LTX-2", fallback = (40, 4.0)
+    ) == (40, 4.0)
+    assert default_video_generation_params(
+        "taiwan-clips.gguf", "user/taiwan-clips", fallback = (40, 4.0)
+    ) == (40, 4.0)
+    # Genuine Wan identifiers (segment-initial, with a version suffix or separator) still match.
+    assert default_video_generation_params("wan2.2-ti2v-5b-Q4_K_M.gguf") == (50, 5.0)
+    assert default_video_generation_params(None, "Wan-AI/Wan2.2-T2V-A14B") == (50, 5.0)
+    # An "ltxv" style name still resolves to LTX (trailing letters stay free).
+    assert default_video_generation_params("ltxv-2.3-distilled") == (8, 1.0)
+    assert default_video_generation_params("Lightricks/LTXV-2.3") == (40, 4.0)
+
+
 def test_wan_size_tables_present():
     ti2v = detect_video_family("Wan-AI/Wan2.2-TI2V-5B-Diffusers")
     a14b = detect_video_family("Wan-AI/Wan2.2-T2V-A14B-Diffusers")