Merge pull request #678 from bioimage-io/pyright

bump pyright and deepdiff

bioimageio/spec/model/v0_4.py

@@ -209,6 +209,37 @@ def check_one_entry(self) -> Self:
 
         return self
 
+    def __getitem__(
+        self,
+        key: Literal[
+            "keras_hdf5",
+            "onnx",
+            "pytorch_state_dict",
+            "tensorflow_js",
+            "tensorflow_saved_model_bundle",
+            "torchscript",
+        ],
+    ):
+        if key == "keras_hdf5":
+            ret = self.keras_hdf5
+        elif key == "onnx":
+            ret = self.onnx
+        elif key == "pytorch_state_dict":
+            ret = self.pytorch_state_dict
+        elif key == "tensorflow_js":
+            ret = self.tensorflow_js
+        elif key == "tensorflow_saved_model_bundle":
+            ret = self.tensorflow_saved_model_bundle
+        elif key == "torchscript":
+            ret = self.torchscript
+        else:
+            raise KeyError(key)
+
+        if ret is None:
+            raise KeyError(key)
+
+        return ret
+
 
 class WeightsEntryDescrBase(FileDescr):
     type: ClassVar[WeightsFormat]

bioimageio/spec/model/v0_5.py

@@ -2026,6 +2026,37 @@ def check_entries(self) -> Self:
 
         return self
 
+    def __getitem__(
+        self,
+        key: Literal[
+            "keras_hdf5",
+            "onnx",
+            "pytorch_state_dict",
+            "tensorflow_js",
+            "tensorflow_saved_model_bundle",
+            "torchscript",
+        ],
+    ):
+        if key == "keras_hdf5":
+            ret = self.keras_hdf5
+        elif key == "onnx":
+            ret = self.onnx
+        elif key == "pytorch_state_dict":
+            ret = self.pytorch_state_dict
+        elif key == "tensorflow_js":
+            ret = self.tensorflow_js
+        elif key == "tensorflow_saved_model_bundle":
+            ret = self.tensorflow_saved_model_bundle
+        elif key == "torchscript":
+            ret = self.torchscript
+        else:
+            raise KeyError(key)
+
+        if ret is None:
+            raise KeyError(key)
+
+        return ret
+
 
 class ModelId(ResourceId):
     pass

scripts/generate_json_schemas.py

@@ -3,9 +3,9 @@
 from argparse import ArgumentParser
 from pathlib import Path
 from tempfile import TemporaryDirectory
-from typing import Any, Dict, Literal, Final
+from typing import Any, Dict, Final, Literal
 
-from deepdiff import DeepDiff  # pyright: ignore [reportMissingTypeStubs]
+from deepdiff.diff import DeepDiff
 from pydantic import ConfigDict, TypeAdapter
 from typing_extensions import assert_never
 

setup.py

@@ -69,7 +69,7 @@
             "jupyter",
             "pdoc",
             "pre-commit",
-            "pyright==1.1.390",
+            "pyright==1.1.391",
             "ruff",
         ],
     },

tests/test_package.py

@@ -2,7 +2,7 @@
 import shutil
 from pathlib import Path
 
-from deepdiff import DeepDiff
+from deepdiff.diff import DeepDiff
 
 from bioimageio.spec.model import v0_5
 

tests/utils.py

@@ -21,7 +21,7 @@
 
 import jsonschema
 import pytest
-from deepdiff import DeepDiff  # pyright: ignore [reportMissingTypeStubs]
+from deepdiff.diff import DeepDiff
 from pydantic import (
     DirectoryPath,
     RootModel,