Update app_zero.py

app_zero.py

@@ -1,6 +1,7 @@
 import sys
 import types
 import datetime
+import re
 from pathlib import Path
 
 import huggingface_hub
@@ -79,7 +80,7 @@ sys.path.append("./PASD")
 
 
 # -------------------------------------------------------------------
-# Runtime patching for PASD legacy imports
+# Runtime patching helpers
 # -------------------------------------------------------------------
 def patch_file(path_str: str, replacements: list[tuple[str, str]]) -> None:
     path = Path(path_str)
@@ -107,8 +108,73 @@ def patch_file(path_str: str, replacements: list[tuple[str, str]]) -> None:
         print(f"[patch] no changes: {path}")
 
 
+def patch_controlnet_loader_import(path_str: str) -> None:
+    path = Path(path_str)
+    if not path.exists():
+        print(f"[patch] file not found: {path}")
+        return
+
+    try:
+        text = path.read_text(encoding="utf-8")
+    except Exception as e:
+        print(f"[patch] failed reading {path}: {e}")
+        return
+
+    safe_block = """try:
+    from diffusers.loaders import FromOriginalControlNetMixin as FromOriginalControlnetMixin
+except Exception:
+    try:
+        from diffusers.loaders import FromOriginalControlnetMixin
+    except Exception:
+        class FromOriginalControlnetMixin:
+            pass
+
+"""
+
+    original = text
+
+    # Enlève d'anciens imports simples
+    text = re.sub(
+        r"(?m)^from diffusers\.loaders[^\n]*FromOriginalControl\w*Mixin[^\n]*\n",
+        "",
+        text,
+    )
+    text = re.sub(
+        r"(?m)^from diffusers\.loaders\.single_file_model[^\n]*FromOriginal\w+[^\n]*\n",
+        "",
+        text,
+    )
+
+    # Enlève d'anciens blocs try/except cassés liés à ce mixin
+    text = re.sub(
+        r"(?ms)^try:\n(?:(?:    |\t).*\n)+?except Exception:\n(?:(?:    |\t).*\n)+?(?=^(?:class|def|@|from |import |\Z))",
+        lambda m: "" if "FromOriginalControl" in m.group(0) else m.group(0),
+        text,
+    )
+
+    # Normalise la référence de mixin dans le reste du fichier
+    text = text.replace("FromOriginalControlNetMixin", "FromOriginalControlnetMixin")
+
+    marker = "class ControlNetConditioningEmbedding"
+    if safe_block not in text:
+        idx = text.find(marker)
+        if idx != -1:
+            text = text[:idx] + safe_block + text[idx:]
+        else:
+            text = safe_block + text
+
+    if text != original:
+        try:
+            path.write_text(text, encoding="utf-8")
+            print(f"[patch] normalized: {path}")
+        except Exception as e:
+            print(f"[patch] failed writing {path}: {e}")
+    else:
+        print(f"[patch] no changes: {path}")
+
+
 def patch_pasd_for_diffusers() -> None:
-    # 1) pipeline_utils path moved
+    # pipeline_utils path moved
     patch_file(
         "./PASD/pipelines/pipeline_pasd.py",
         [
@@ -119,7 +185,7 @@ def patch_pasd_for_diffusers() -> None:
         ],
     )
 
-    # 2) PositionNet -> GLIGENTextBoundingboxProjection alias
+    # PositionNet -> GLIGENTextBoundingboxProjection alias
     patch_file(
         "./PASD/models/pasd/unet_2d_condition.py",
         [
@@ -131,7 +197,7 @@ def patch_pasd_for_diffusers() -> None:
         ],
     )
 
-    # 3) internal module paths moved in newer diffusers
+    # internal module paths moved in newer diffusers
     patch_file(
         "./PASD/models/pasd/unet_2d_blocks.py",
         [
@@ -150,43 +216,8 @@ def patch_pasd_for_diffusers() -> None:
         ],
     )
 
-    # 4) robust ControlNet mixin fallback at top level
-    controlnet_import_fallback = (
-        "try:\n"
-        "    from diffusers.loaders import FromOriginalControlNetMixin as FromOriginalControlnetMixin\n"
-        "except ImportError:\n"
-        "    try:\n"
-        "        from diffusers.loaders import FromOriginalControlnetMixin\n"
-        "    except ImportError:\n"
-        "        class FromOriginalControlnetMixin:\n"
-        "            pass"
-    )
-
-    patch_file(
-        "./PASD/models/pasd/controlnet.py",
-        [
-            (
-                "from diffusers.loaders import FromOriginalControlnetMixin",
-                controlnet_import_fallback,
-            ),
-            (
-                "from diffusers.loaders import FromOriginalControlNetMixin",
-                controlnet_import_fallback,
-            ),
-            (
-                "from diffusers.loaders.single_file_model import FromOriginalModelMixin as FromOriginalControlnetMixin",
-                controlnet_import_fallback,
-            ),
-            (
-                "from diffusers.loaders.single_file_model import FromOriginalModelMixin as FromOriginalControlNetMixin",
-                controlnet_import_fallback,
-            ),
-            (
-                "FromOriginalControlNetMixin",
-                "FromOriginalControlnetMixin",
-            ),
-        ],
-    )
+    # robust controlnet patch
+    patch_controlnet_loader_import("./PASD/models/pasd/controlnet.py")
 
 
 patch_pasd_for_diffusers()