fix 11

pipeline.py

@@ -44,6 +44,7 @@
 from typing import Optional, Tuple, Dict, Any, Union
 
 import numpy as np
+import yaml  # for SAM2 config introspection
 
 # Try to apply GPU/perf tuning early if present
 try:
@@ -405,6 +406,57 @@ def _build_stage_a_checkerboard_from_mask(
         writer.release()
     return ok_any
 
+# --------------------------------------------------------------------------------------
+# SAM2 helpers (config resolution & robust loader)
+# --------------------------------------------------------------------------------------
+def _resolve_sam2_cfg(cfg_str: str) -> str:
+    """Make the SAM2 config path absolute (prefer inside TP_SAM2)."""
+    cfg_path = Path(cfg_str)
+    if not cfg_path.is_absolute():
+        candidate = TP_SAM2 / cfg_path
+        if candidate.exists():
+            return str(candidate)
+    if cfg_path.exists():
+        return str(cfg_path)
+    # Last resort: common defaults inside the repo
+    for name in ["configs/sam2/sam2_hiera_l.yaml", "configs/sam2/sam2_hiera_b.yaml", "configs/sam2/sam2_hiera_s.yaml"]:
+        p = TP_SAM2 / name
+        if p.exists():
+            return str(p)
+    return str(cfg_str)  # let build_sam2 raise a clear error
+
+def _find_hiera_config_if_hieradet(cfg_path: str) -> Optional[str]:
+    """
+    If the given config references 'hieradet', try to find a 'hiera' config in the repo and return it.
+    """
+    try:
+        with open(cfg_path, "r") as f:
+            data = yaml.safe_load(f)
+        # Look for target under model.image_encoder.trunk._target_ (Hydra style)
+        target = None
+        model = data.get("model", {})
+        enc = (model.get("image_encoder") or {})
+        trunk = (enc.get("trunk") or {})
+        target = trunk.get("_target_") or trunk.get("target")
+        if isinstance(target, str) and "hieradet" in target:
+            # Search all yaml files under TP_SAM2/configs for those that reference ".hiera."
+            for y in TP_SAM2.rglob("*.yaml"):
+                try:
+                    with open(y, "r") as f2:
+                        d2 = yaml.safe_load(f2)
+                    m2 = (d2 or {}).get("model", {})
+                    e2 = (m2.get("image_encoder") or {})
+                    t2 = (e2.get("trunk") or {})
+                    tgt2 = t2.get("_target_") or t2.get("target")
+                    if isinstance(tgt2, str) and ".hiera." in tgt2:
+                        logger.info(f"SAM2: switching config from 'hieradet' → 'hiera': {y}")
+                        return str(y)
+                except Exception:
+                    continue
+    except Exception:
+        pass
+    return None
+
 # --------------------------------------------------------------------------------------
 # SAM2 Integration (robust to different build_sam2 signatures)
 # --------------------------------------------------------------------------------------
@@ -414,6 +466,8 @@ def load_sam2() -> Tuple[Optional[object], bool, Dict[str, Any]]:
     - config_file vs model_cfg
     - checkpoint vs ckpt_path vs weights
     - optional device kwarg
+    - absolute config resolution (inside third_party/sam2)
+    - auto-fix if config references 'hieradet' but repo has 'hiera'
     """
     meta = {"sam2_import_ok": False, "sam2_init_ok": False}
     try:
@@ -425,22 +479,18 @@ def load_sam2() -> Tuple[Optional[object], bool, Dict[str, Any]]:
         return None, False, meta
 
     device = _pick_device("SAM2_DEVICE")
-    cfg = os.environ.get("SAM2_MODEL_CFG", "configs/sam2/sam2_hiera_l.yaml")
+    cfg_env = os.environ.get("SAM2_MODEL_CFG", "configs/sam2/sam2_hiera_l.yaml")
+    cfg = _resolve_sam2_cfg(cfg_env)
     ckpt = os.environ.get("SAM2_CHECKPOINT", "")
 
-    try:
+    def _try_build(cfg_path: str):
         params = set(inspect.signature(build_sam2).parameters.keys())
         kwargs = {}
-
         # Config arg
         if "config_file" in params:
-            kwargs["config_file"] = cfg
+            kwargs["config_file"] = cfg_path
         elif "model_cfg" in params:
-            kwargs["model_cfg"] = cfg
-        else:
-            # if neither is present, try positional later
-            pass
-
+            kwargs["model_cfg"] = cfg_path
         # Checkpoint arg
         if ckpt:
             if "checkpoint" in params:
@@ -449,22 +499,33 @@ def load_sam2() -> Tuple[Optional[object], bool, Dict[str, Any]]:
                 kwargs["ckpt_path"] = ckpt
             elif "weights" in params:
                 kwargs["weights"] = ckpt
-
-        # Device (if supported via kwarg)
+        # Device
         if "device" in params:
             kwargs["device"] = device
-
-        # Try keyword call first
+        # Try keywords first, then positional fallback
         try:
-            sam = build_sam2(**kwargs)
+            return build_sam2(**kwargs)
         except TypeError:
-            # Fallback to positional (cfg, ckpt?, device?)
-            pos = [cfg]
+            pos = [cfg_path]
             if ckpt:
                 pos.append(ckpt)
             if "device" not in kwargs:
                 pos.append(device)
-            sam = build_sam2(*pos)
+            return build_sam2(*pos)
+
+    try:
+        try:
+            sam = _try_build(cfg)
+        except Exception as e1:
+            msg = str(e1)
+            # If the config is using 'hieradet', try to swap to a 'hiera' config
+            alt_cfg = _find_hiera_config_if_hieradet(cfg)
+            if alt_cfg:
+                logger.info(f"SAM2: retrying with alt config: {alt_cfg}")
+                sam = _try_build(alt_cfg)
+                cfg = alt_cfg
+            else:
+                raise
 
         predictor = SAM2ImagePredictor(sam)
         meta.update({