Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix: detect MinerU models in ModelScope cache layout

FriedorixNietzschefff69b43be82
diff --git a/deeptutor/services/parsing/engines/mineru/readiness.py b/deeptutor/services/parsing/engines/mineru/readiness.py
index 294ed1470..13664e0c0 100644
--- a/deeptutor/services/parsing/engines/mineru/readiness.py
+++ b/deeptutor/services/parsing/engines/mineru/readiness.py
@@ -33,7 +33,18 @@ def _modelscope_dir() -> Path:
def mineru_models_ready(_source: str = "huggingface") -> bool:
"""Best-effort check for already-downloaded MinerU weights (fail-closed)."""
- for root in (_hf_hub_dir(), _modelscope_dir()):
+ modelscope_root = _modelscope_dir()
+ roots = [_hf_hub_dir()]
+
+ # With MODELSCOPE_CACHE set, ModelScope stores downloaded repositories
+ # below <cache>/models. Keep scanning the cache root as well for existing
+ # installations that use the previously supported flat layout.
+ modelscope_models = modelscope_root / "models"
+ if modelscope_models.is_dir():
+ roots.append(modelscope_models)
+ roots.append(modelscope_root)
+
+ for root in roots:
try:
if not root.is_dir():
continue
diff --git a/tests/services/parsing/test_engines.py b/tests/services/parsing/test_engines.py
index 0f45a9a3a..13514309a 100644
--- a/tests/services/parsing/test_engines.py
+++ b/tests/services/parsing/test_engines.py
@@ -171,6 +171,28 @@ def test_markitdown_readiness_requires_current_package(monkeypatch) -> None:
assert "0.1.7" in report.message
+def test_mineru_models_ready_supports_modelscope_cache_layouts(tmp_path, monkeypatch) -> None:
+ from deeptutor.services.parsing.engines.mineru import readiness as rd
+
+ monkeypatch.setenv("HF_HOME", str(tmp_path / "empty-huggingface"))
+
+ nested_cache = tmp_path / "modelscope-nested"
+ nested_model = nested_cache / "models" / "OpenDataLab--MinerU2.5-Pro-2605-1.2B"
+ nested_model.mkdir(parents=True)
+ (nested_model / "model.safetensors").write_bytes(b"weights")
+ monkeypatch.setenv("MODELSCOPE_CACHE", str(nested_cache))
+
+ assert rd.mineru_models_ready() is True
+
+ flat_cache = tmp_path / "modelscope-flat"
+ flat_model = flat_cache / "OpenDataLab--PDF-Extract-Kit-1.0"
+ flat_model.mkdir(parents=True)
+ (flat_model / "config.json").write_text("{}", encoding="utf-8")
+ monkeypatch.setenv("MODELSCOPE_CACHE", str(flat_cache))
+
+ assert rd.mineru_models_ready() is True
+
+
def test_mineru_cloud_readiness_needs_token() -> None:
from deeptutor.services.parsing.engines.mineru.config import MinerUConfig
from deeptutor.services.parsing.engines.mineru.readiness import mineru_readiness