turn original_version into Version

Author: FynnBe

bioimageio/spec/_internal/base_nodes.py

@@ -39,7 +39,7 @@
 from typing_extensions import Annotated, LiteralString, Self
 
 from bioimageio.spec._internal.constants import IN_PACKAGE_MESSAGE
-from bioimageio.spec._internal.types import NotEmpty, RdfContent, YamlValue
+from bioimageio.spec._internal.types import NotEmpty, RdfContent, Version, YamlValue
 from bioimageio.spec._internal.types.field_validation import is_valid_yaml_mapping
 from bioimageio.spec._internal.utils import unindent
 from bioimageio.spec._internal.validation_context import InternalValidationContext, get_internal_validation_context
@@ -50,7 +50,7 @@
 
 if sys.version_info < (3, 9):
 
-    class FrozenDictBase(collections.abc.Mapping, Generic[K, V]):
+    class FrozenDictBase(collections.abc.Mapping, Generic[K, V]):  # pyright: ignore[reportMissingTypeArgument]
         pass
 
 else:
@@ -209,8 +209,7 @@ def _update_context(cls, context: InternalValidationContext, data: RdfContent) -
         # set original format if possible
         original_format = data.get("format_version")
         if "original_format" not in context and isinstance(original_format, str) and original_format.count(".") == 2:
-            context["original_format"] = cast(Tuple[int, int, int], tuple(map(int, original_format.split("."))))
-            assert len(context["original_format"]) == 3
+            context["original_format"] = Version(original_format)
 
     @classmethod
     def model_validate(
@@ -337,7 +336,7 @@ def keys(self) -> Set[K]:  # type: ignore
     def __contains__(self, key: Any):
         return key in self.model_fields_set
 
-    def get(self, item: Any, default: D = None) -> Union[V, D]:  # type: ignore
+    def get(self, item: Any, default: D = None) -> Union[V, D]:
         return getattr(self, item, default)
 
     @model_validator(mode="after")

bioimageio/spec/_internal/utils.py

@@ -46,14 +46,14 @@ def iterate_annotated_union(typ: type) -> Iterator[Any]:
 def nest_dict(flat_dict: Dict[Tuple[K, ...], V]) -> NestedDict[K, V]:
     res: NestedDict[K, V] = {}
     for k, v in flat_dict.items():
-        node = res
+        node: Union[Dict[K, Union[NestedDict[K, V], V]], NestedDict[K, V]] = res
         for kk in k[:-1]:
-            if not isinstance(node, dict):
+            if not isinstance(node, dict):  # pyright: ignore[reportUnnecessaryIsInstance]
                 raise ValueError(f"nesting level collision for flat key {k} at {kk}")
             d: NestedDict[K, V] = {}
-            node = node.setdefault(kk, d)
+            node = node.setdefault(kk, d)  # type: ignore
 
-        if not isinstance(node, dict):
+        if not isinstance(node, dict):  # pyright: ignore[reportUnnecessaryIsInstance]
             raise ValueError(f"nesting level collision for flat key {k}")
 
         node[k[-1]] = v

bioimageio/spec/_internal/validation_context.py

@@ -5,6 +5,7 @@
 from typing_extensions import NotRequired, TypedDict
 
 from bioimageio.spec._internal.constants import ERROR, WARNING_LEVEL_CONTEXT_KEY
+from bioimageio.spec._internal.types._version import Version
 
 WarningSeverity = Literal[20, 30, 35]
 WarningLevel = Literal[WarningSeverity, 50]
@@ -32,7 +33,7 @@ class InternalValidationContext(TypedDict):
     warning_level: WarningLevel
     """raise warnings of severity s as validation errors if s >= `warning_level`"""
 
-    original_format: NotRequired[Tuple[int, int, int]]
+    original_format: NotRequired[Version]
     """original format version of the validation data (set dynamically during validation of resource descriptions)."""
 
     collection_base_content: NotRequired[Dict[str, Any]]

bioimageio/spec/generic/v0_2.py

@@ -49,7 +49,7 @@ class _Person(Node, frozen=True):
     @classmethod
     def convert_name(cls, name: Any, info: FieldValidationInfo):
         ctxt = get_internal_validation_context(info.context)
-        if "original_format" in ctxt and ctxt["original_format"] < (0, 2, 3) and isinstance(name, str):
+        if "original_format" in ctxt and ctxt["original_format"] < Version("0.2.3") and isinstance(name, str):
             name = name.replace("/", "").replace("\\", "")
 
         return name

bioimageio/spec/model/v0_4.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import warnings
 from typing import Any, ClassVar, Dict, FrozenSet, List, Literal, NewType, Optional, Sequence, Tuple, Union
 
 from annotated_types import Ge, Interval, MaxLen, MinLen, MultipleOf