fix(dino): drop default HF near-assets; use torch.hub facebookresearch/dinov2

- No snapshot_download unless NEAR_AUX_REPO or NEAR_DINO_LOCAL_REPO is set
- Optional NEAR_DINO_TORCH_HUB_REPO overrides github repo id
- Tests: github default path; resolve() without mirror raises

Made-with: Cursor

tests/test_dino_hub.py

@@ -33,6 +33,7 @@ class DinoHubTests(unittest.TestCase):
             "NEAR_DINO_REPO_SUBDIR",
             "NEAR_DINO_MODEL_ID",
             "NEAR_DINO_FILENAME",
+            "NEAR_DINO_TORCH_HUB_REPO",
         ):
             os.environ.pop(key, None)
         dino_hub.resolve_dinov2_repo_root.cache_clear()
@@ -47,12 +48,15 @@ class DinoHubTests(unittest.TestCase):
         repo_root = self.tmp_path / "dinov2-local"
         _write_hub_repo(repo_root)
         os.environ["NEAR_DINO_LOCAL_REPO"] = str(repo_root)
-        os.environ["NEAR_AUX_REPO"] = "luh0502/near-assets"
 
         resolved = dino_hub.resolve_dinov2_repo_root()
 
         self.assertEqual(resolved, str(repo_root.resolve()))
 
+    def test_resolve_dinov2_repo_root_requires_mirror_when_no_local(self) -> None:
+        with self.assertRaises(FileNotFoundError):
+            dino_hub.resolve_dinov2_repo_root()
+
     def test_resolve_dinov2_repo_root_uses_aux_repo_subdir(self) -> None:
         aux_root = self.tmp_path / "near-assets"
         repo_root = aux_root / "dinov2"
@@ -91,6 +95,18 @@ class DinoHubTests(unittest.TestCase):
             pretrained=True,
         )
 
+    def test_load_dinov2_model_torch_hub_github_when_no_mirror_env(self) -> None:
+        fake_torch = types.SimpleNamespace(hub=types.SimpleNamespace(load=mock.Mock(return_value=object())))
+        with mock.patch.dict(sys.modules, {"torch": fake_torch}):
+            loaded = dino_hub.load_dinov2_model("dinov2_vitl14_reg")
+
+        self.assertIsNotNone(loaded)
+        fake_torch.hub.load.assert_called_once_with(
+            "facebookresearch/dinov2",
+            "dinov2_vitl14_reg",
+            pretrained=True,
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

trellis/utils/dino_hub.py

@@ -31,7 +31,12 @@ def _validate_repo_root(repo_root: Path) -> Path:
 
 @lru_cache(maxsize=1)
 def resolve_dinov2_repo_root() -> str:
-    """Resolve a local or HF-cached torch.hub-compatible DINOv2 repository."""
+    """Resolve a local or HF-cached torch.hub-compatible DINOv2 repository (mirror path only).
+
+    Requires ``NEAR_DINO_LOCAL_REPO`` (existing directory) or non-empty ``NEAR_AUX_REPO``
+    (local directory or Hugging Face ``org/model``). There is no default Hub id here —
+    default loading in :func:`load_dinov2_model` uses ``torch.hub`` + GitHub instead.
+    """
     t0 = time.time()
     local_repo = (os.environ.get("NEAR_DINO_LOCAL_REPO") or "").strip()
     if _is_local_dir(local_repo):
@@ -39,7 +44,14 @@ def resolve_dinov2_repo_root() -> str:
         print(f"[NeAR] timing dino.resolve_repo_root: {time.time() - t0:.1f}s (source=local)", flush=True)
         return resolved
 
-    aux_repo = (os.environ.get("NEAR_AUX_REPO") or "luh0502/near-assets").strip()
+    aux_repo = (os.environ.get("NEAR_AUX_REPO") or "").strip()
+    if not aux_repo:
+        raise FileNotFoundError(
+            "resolve_dinov2_repo_root() needs NEAR_DINO_LOCAL_REPO or NEAR_AUX_REPO. "
+            "For normal runs, use load_dinov2_model() without calling this — it loads from "
+            "torch.hub (facebookresearch/dinov2) when no mirror env vars are set."
+        )
+
     subdir = (os.environ.get("NEAR_DINO_REPO_SUBDIR") or "dinov2").strip().strip("/")
     if _is_local_dir(aux_repo):
         local_aux = Path(aux_repo).expanduser()
@@ -70,30 +82,61 @@ def resolve_dinov2_repo_root() -> str:
             return resolved
 
     raise FileNotFoundError(
-        "Could not locate a torch.hub-compatible DINOv2 repo. "
-        "Set NEAR_DINO_LOCAL_REPO to a local mirror, or publish one under "
-        f"{aux_repo!r} with subdir {subdir!r}."
+        "Could not locate a torch.hub-compatible DINOv2 repo under NEAR_AUX_REPO. "
+        f"Checked {aux_repo!r} with subdir {subdir!r}, or unset NEAR_AUX_REPO to use "
+        "default torch.hub (facebookresearch/dinov2)."
     )
 
 
 def load_dinov2_model(model_name: str):
-    """Load a DINOv2 backbone from a local or HF-cached mirror instead of GitHub."""
+    """Load DINOv2: local mirror, optional HF aux mirror, or official torch.hub (GitHub)."""
     import torch
 
     t0 = time.time()
-    repo_root = resolve_dinov2_repo_root()
     resolved_model_name = (os.environ.get("NEAR_DINO_MODEL_ID") or model_name).strip() or model_name
+
+    local_repo = (os.environ.get("NEAR_DINO_LOCAL_REPO") or "").strip()
+    if _is_local_dir(local_repo):
+        repo_root = str(_validate_repo_root(Path(local_repo).expanduser()))
+        print(
+            f"[NeAR] Loading DINOv2 backbone {resolved_model_name!r} from local mirror {repo_root}",
+            flush=True,
+        )
+        t_hub = time.time()
+        model = torch.hub.load(
+            repo_or_dir=repo_root,
+            model=resolved_model_name,
+            source="local",
+            pretrained=True,
+        )
+        print(f"[NeAR] timing dino.torch_hub_load: {time.time() - t_hub:.1f}s", flush=True)
+        print(f"[NeAR] timing dino.load_total: {time.time() - t0:.1f}s", flush=True)
+        return model
+
+    if (os.environ.get("NEAR_AUX_REPO") or "").strip():
+        repo_root = resolve_dinov2_repo_root()
+        print(
+            f"[NeAR] Loading DINOv2 backbone {resolved_model_name!r} from aux mirror {repo_root}",
+            flush=True,
+        )
+        t_hub = time.time()
+        model = torch.hub.load(
+            repo_or_dir=repo_root,
+            model=resolved_model_name,
+            source="local",
+            pretrained=True,
+        )
+        print(f"[NeAR] timing dino.torch_hub_load: {time.time() - t_hub:.1f}s", flush=True)
+        print(f"[NeAR] timing dino.load_total: {time.time() - t0:.1f}s", flush=True)
+        return model
+
+    hub_repo = (os.environ.get("NEAR_DINO_TORCH_HUB_REPO") or "facebookresearch/dinov2").strip()
     print(
-        f"[NeAR] Loading DINOv2 backbone {resolved_model_name!r} from local/HF mirror {repo_root}",
+        f"[NeAR] Loading DINOv2 {resolved_model_name!r} via torch.hub from {hub_repo!r} (github)",
         flush=True,
     )
     t_hub = time.time()
-    model = torch.hub.load(
-        repo_or_dir=repo_root,
-        model=resolved_model_name,
-        source="local",
-        pretrained=True,
-    )
+    model = torch.hub.load(hub_repo, resolved_model_name, pretrained=True)
     print(f"[NeAR] timing dino.torch_hub_load: {time.time() - t_hub:.1f}s", flush=True)
     print(f"[NeAR] timing dino.load_total: {time.time() - t0:.1f}s", flush=True)
     return model