A GPU task manager for Windows, Linux, and WSL: per-process VRAM, GPU activity, and LLM model/KV-cache insights (Windows AMD and NVIDIA).
Python
Don't crash on Ollama manifests whose layers are null
Scott Hanselman4105c4bfec6a
diff --git a/src/gputaskman/stores.py b/src/gputaskman/stores.pyindex b9b7a4a..1369307 100644--- a/src/gputaskman/stores.py+++ b/src/gputaskman/stores.py@@ -17,6 +17,18 @@ _ollama_cache: dict[str, tuple[float, dict[str, list[str]]]] = {}_lms_cache: tuple[float, list[str]] | None = None+def _layer_digests(manifest: object) -> list[str]:+ """Digests an Ollama manifest lists. A null or malformed 'layers' (Go marshals a nil slice as null) lists none."""+ layers = manifest.get("layers") if isinstance(manifest, dict) else None+ digests = []+ for layer in layers if isinstance(layers, list) else ():+ digest = layer.get("digest") if isinstance(layer, dict) else None+ digest = digest.removeprefix("sha256:").lower() if isinstance(digest, str) else ""+ if digest:+ digests.append(digest)+ return digests++def ollama_names(models_root: str) -> dict[str, list[str]]:"""{sha256 hex: ["qwen3:14b", ...]} from <root>/manifests/<registry>/<namespace>/<model>/<tag>."""now = time.time()@@ -35,13 +47,11 @@ def ollama_names(models_root: str) -> dict[str, list[str]]:for tag in files:try:with open(os.path.join(dirpath, tag), encoding="utf-8") as f:- layers = json.load(f).get("layers", [])- except (OSError, ValueError, AttributeError):+ manifest = json.load(f)+ except (OSError, ValueError):continue- for layer in layers:- digest = str(layer.get("digest", "")).removeprefix("sha256:").lower()- if digest:- names.setdefault(digest, []).append(f"{prefix}{model}:{tag}")+ for digest in _layer_digests(manifest):+ names.setdefault(digest, []).append(f"{prefix}{model}:{tag}")_ollama_cache[models_root] = (now, names)return namesdiff --git a/tests/test_core.py b/tests/test_core.pyindex f92060b..bc61ee0 100644--- a/tests/test_core.py+++ b/tests/test_core.py@@ -37,7 +37,7 @@ from gputaskman.pdh import AdapterGpu, GpuCounters, ProcGpufrom gputaskman.procinfo import (AI_KINDS, MappedModel, ProcDetail, ProcInspector, _is_model_file, _match_runtimes,_models_from_cmdline, classify, file_key, installed_models, make_model)from gputaskman.report import to_dict, to_text-from gputaskman.stores import store_name+from gputaskman.stores import ollama_names, store_namefrom tools.capture_screenshots import for_publication@@ -763,6 +763,42 @@ class IdentityTests(unittest.TestCase):hf = r"C:\x\hub\models--ggml-org--Laya-GGUF\snapshots\0123\Laya-Q8_0.gguf"self.assertEqual(store_name(hf, []), "ggml-org/Laya-GGUF")+ @staticmethod+ def _ollama_store(root: str, manifests: dict[str, str]) -> None:+ for model, text in manifests.items():+ folder = Path(root, "manifests", "registry.ollama.ai", "library", model)+ folder.mkdir(parents=True)+ (folder / "latest").write_text(text, encoding="utf-8")++ def test_store_names_skip_unusable_manifests(self):+ good, hidden = "ab" * 32, "cd" * 32+ shapes = {+ "layers null (a Go nil slice)": '{"layers": null}',+ "layers missing": '{"config": {}}',+ "layers not a list": json.dumps({"layers": {"digest": f"sha256:{hidden}"}}),+ "layers is text": json.dumps({"layers": f"sha256:{hidden}"}),+ "manifest not an object": json.dumps([{"digest": f"sha256:{hidden}"}]),+ "layer not an object": json.dumps({"layers": [None, f"sha256:{hidden}", 7]}),+ "digest not usable": json.dumps({"layers": [{"digest": None}, {"digest": 7}, {"digest": "sha256:"}, {}]}),+ "not JSON": "{not json",+ "empty file": "",+ }+ for shape, text in shapes.items():+ with self.subTest(shape), tempfile.TemporaryDirectory() as root:+ self._ollama_store(root, {"good": json.dumps({"layers": [{"digest": f"sha256:{good}"}]}), "odd": text})+ self.assertEqual(set(ollama_names(root)), {good})+ blob = make_model(str(Path(root, "blobs", f"sha256-{good}")), 1, 0, False, "cmdline")+ self.assertEqual(blob.store_name, "good:latest")+ self.assertIsNone(store_name(str(Path(root, "blobs", f"sha256-{hidden}"))))++ def test_store_names_keep_good_layers_beside_bad_ones(self):+ digest = "ef" * 32+ layers = [None, "sha256:" + "01" * 32, {"digest": 7}, {"digest": f"sha256:{digest.upper()}"}]+ with tempfile.TemporaryDirectory() as root:+ self._ollama_store(root, {"mixed": json.dumps({"layers": layers})})+ self.assertEqual(store_name(str(Path(root, "blobs", f"sha256-{digest}"))), "mixed:latest")+ self.assertEqual(set(ollama_names(root)), {digest})+def test_runtime_api_normalization(self):v1 = {"models": [{"type": "decision", "key": "laya", "decision_type": "laya", "quantization": {"name": "Q8_0"},