Trimmed version

src/omnipy/data/dataset.py

@@ -242,14 +242,13 @@ def _get_data_field(cls) -> ModelField:
         return cast(ModelField, cls.__fields__.get(DATA_KEY))
 
     @classmethod
-    def get_model_class(cls) -> Type[Model]:
+    def get_model_class(cls) -> type[Model] | None:
         """
         Returns the concrete Model class used for all data files in the dataset, e.g.:
         `Model[list[int]]`
         :return: The concrete Model class used for all data files in the dataset
         """
-        model_type = cls._get_data_field().type_
-        return model_type
+        return cls._get_data_field().type_
 
     @staticmethod
     def _raise_no_model_exception() -> None:
@@ -618,9 +617,9 @@ def _to_data_if_model(data_obj: Any):
         return data_obj
 
 
-_KwargValT = TypeVar('_KwargValT', bound=object)
-_ParamModelT = TypeVar('_ParamModelT', bound=ParamModel)
-_ListOfParamModelT = TypeVar('_ListOfParamModelT', bound=ListOfParamModel)
+_KwargValT = TypeVar('_KwargValT', bound=object, default=object)
+_ParamModelT = TypeVar('_ParamModelT', bound=ParamModel, default=ParamModel)
+_ListOfParamModelT = TypeVar('_ListOfParamModelT', bound=ListOfParamModel, default=ListOfParamModel)
 
 ParamModelSuperKwargsType: TypeAlias = \
     dict[str, dict[str, _ParamModelT | DataWithParams[_ParamModelT, _KwargValT]]]

src/omnipy/data/helpers.py

@@ -4,13 +4,19 @@
 from typing_extensions import TypeVar
 
 T = TypeVar('T')
+U = TypeVar('U')
 
 
 class TypeVarStore(Generic[T]):
     def __init__(self, t: T) -> None:
         raise ValueError()
 
 
+class DoubleTypeVarStore(Generic[T, U]):
+    def __init__(self, t: T | U) -> None:
+        raise ValueError()
+
+
 class TypeVarStore1(TypeVarStore[T], Generic[T]):
     ...