mlrun 1.6.4rc2__py3-none-any.whl → 1.7.0rc20__py3-none-any.whl

mlrun/feature_store/steps.py

@@ -16,7 +16,7 @@ import math
 import re
 import uuid
 from collections import OrderedDict
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 
 import numpy as np
 import pandas as pd
@@ -92,8 +92,6 @@ class MLRunStep(MapClass):
 
 
 class FeaturesetValidator(StepToDict, MLRunStep):
-    """Validate feature values according to the feature set validation policy"""
-
     def __init__(self, featureset=None, columns=None, name=None, **kwargs):
         """Validate feature values according to the feature set validation policy
 
@@ -152,11 +150,9 @@ class FeaturesetValidator(StepToDict, MLRunStep):
 
 
 class MapValues(StepToDict, MLRunStep):
-    """Map column values to new values"""
-
     def __init__(
         self,
-        mapping: Dict[str, Dict[Union[str, int, bool], Any]],
+        mapping: dict[str, dict[Union[str, int, bool], Any]],
         with_original_features: bool = False,
         suffix: str = "mapped",
         **kwargs,
@@ -166,13 +162,19 @@ class MapValues(StepToDict, MLRunStep):
         example::
 
             # replace the value "U" with '0' in the age column
-            graph.to(MapValues(mapping={'age': {'U': '0'}}, with_original_features=True))
+            graph.to(MapValues(mapping={"age": {"U": "0"}}, with_original_features=True))
 
             # replace integers, example
-            graph.to(MapValues(mapping={'not': {0: 1, 1: 0}}))
+            graph.to(MapValues(mapping={"not": {0: 1, 1: 0}}))
 
             # replace by range, use -inf and inf for extended range
-            graph.to(MapValues(mapping={'numbers': {'ranges': {'negative': [-inf, 0], 'positive': [0, inf]}}}))
+            graph.to(
+                MapValues(
+                    mapping={
+                        "numbers": {"ranges": {"negative": [-inf, 0], "positive": [0, inf]}}
+                    }
+                )
+            )
 
         :param mapping: a dict with entry per column and the associated old/new values map
         :param with_original_features: set to True to keep the original features
@@ -377,7 +379,7 @@ class Imputer(StepToDict, MLRunStep):
         self,
         method: str = "avg",
         default_value=None,
-        mapping: Dict[str, Any] = None,
+        mapping: dict[str, Any] = None,
         **kwargs,
     ):
         """Replace None values with default values
@@ -423,13 +425,15 @@ class Imputer(StepToDict, MLRunStep):
 
 
 class OneHotEncoder(StepToDict, MLRunStep):
-    def __init__(self, mapping: Dict[str, List[Union[int, str]]], **kwargs):
+    def __init__(self, mapping: dict[str, list[Union[int, str]]], **kwargs):
         """Create new binary fields, one per category (one hot encoded)
 
         example::
 
-            mapping = {'category': ['food', 'health', 'transportation'],
-                       'gender': ['male', 'female']}
+            mapping = {
+                "category": ["food", "health", "transportation"],
+                "gender": ["male", "female"],
+            }
             graph.to(OneHotEncoder(mapping=one_hot_encoder_mapping))
 
         :param mapping: a dict of per column categories (to map to binary fields)
@@ -510,15 +514,13 @@ class OneHotEncoder(StepToDict, MLRunStep):
 
 
 class DateExtractor(StepToDict, MLRunStep):
-    """Date Extractor allows you to extract a date-time component"""
-
     def __init__(
         self,
-        parts: Union[Dict[str, str], List[str]],
+        parts: Union[dict[str, str], list[str]],
         timestamp_col: str = None,
         **kwargs,
     ):
-        """Date Extractor extract a date-time component into new columns
+        """Date Extractor extracts a date-time component into new columns
 
         The extracted date part will appear as `<timestamp_col>_<date_part>` feature.
 
@@ -548,10 +550,12 @@ class DateExtractor(StepToDict, MLRunStep):
 
             # (taken from the fraud-detection end-to-end feature store demo)
             # Define the Transactions FeatureSet
-            transaction_set = fstore.FeatureSet("transactions",
-                                            entities=[fstore.Entity("source")],
-                                            timestamp_key='timestamp',
-                                            description="transactions feature set")
+            transaction_set = fstore.FeatureSet(
+                "transactions",
+                entities=[fstore.Entity("source")],
+                timestamp_key="timestamp",
+                description="transactions feature set",
+            )
 
             # Get FeatureSet computation graph
             transaction_graph = transaction_set.graph
@@ -559,11 +563,11 @@ class DateExtractor(StepToDict, MLRunStep):
             # Add the custom `DateExtractor` step
             # to the computation graph
             transaction_graph.to(
-                    class_name='DateExtractor',
-                    name='Extract Dates',
-                    parts = ['hour', 'day_of_week'],
-                    timestamp_col = 'timestamp',
-                )
+                class_name="DateExtractor",
+                name="Extract Dates",
+                parts=["hour", "day_of_week"],
+                timestamp_col="timestamp",
+            )
 
         :param parts: list of pandas style date-time parts you want to extract.
         :param timestamp_col: The name of the column containing the timestamps to extract from,
@@ -629,8 +633,6 @@ class DateExtractor(StepToDict, MLRunStep):
 
 
 class SetEventMetadata(MapClass):
-    """Set the event metadata (id and key) from the event body"""
-
     def __init__(
         self,
         id_path: Optional[str] = None,
@@ -695,18 +697,19 @@ class SetEventMetadata(MapClass):
 
 
 class DropFeatures(StepToDict, MLRunStep):
-    def __init__(self, features: List[str], **kwargs):
+    def __init__(self, features: list[str], **kwargs):
         """Drop all the features from feature list
 
         :param features:    string list of the features names to drop
 
         example::
 
-            feature_set = fstore.FeatureSet("fs-new",
-                                        entities=[fstore.Entity("id")],
-                                        description="feature set",
-                                        engine="pandas",
-                                        )
+            feature_set = fstore.FeatureSet(
+                "fs-new",
+                entities=[fstore.Entity("id")],
+                description="feature set",
+                engine="pandas",
+            )
             # Pre-processing graph steps
             feature_set.graph.to(DropFeatures(features=["age"]))
             df_pandas = feature_set.ingest(data)

mlrun/features.py

@@ -14,7 +14,7 @@
 #
 import math
 import re
-from typing import Dict, List, Optional, Union
+from typing import Optional, Union
 
 from .data_types import ValueType, python_type_to_value_type
 from .errors import MLRunRuntimeError, err_to_str
@@ -44,7 +44,7 @@ class Entity(ModelObj):
         name: str = None,
         value_type: Union[ValueType, str] = None,
         description: str = None,
-        labels: Optional[Dict[str, str]] = None,
+        labels: Optional[dict[str, str]] = None,
     ):
         """data entity (index key)
 
@@ -65,8 +65,6 @@ class Entity(ModelObj):
 
 
 class Feature(ModelObj):
-    """data feature"""
-
     _dict_fields = [
         "name",
         "description",
@@ -82,13 +80,13 @@ class Feature(ModelObj):
     def __init__(
         self,
         value_type: Union[ValueType, str] = None,
-        dims: List[int] = None,
+        dims: list[int] = None,
         description: str = None,
         aggregate: bool = None,
         name: str = None,
         validator=None,
         default: str = None,
-        labels: Dict[str, str] = None,
+        labels: dict[str, str] = None,
     ):
         """data feature
 
@@ -240,10 +238,7 @@ class Validator(ModelObj):
             from mlrun.features import Validator
 
             # Add validator to the feature 'bid' with check type
-            quotes_set["bid"].validator = Validator(
-                check_type=True,
-                severity="info"
-            )
+            quotes_set["bid"].validator = Validator(check_type=True, severity="info")
 
         :param check_type:  check feature type e.g. True, False
         :param severity:    severity name e.g. info, warning, etc.
@@ -282,10 +277,7 @@ class MinMaxValidator(Validator):
 
             # Add validator to the feature 'bid', where valid
             # minimal value is 52
-            quotes_set["bid"].validator = MinMaxValidator(
-                min=52,
-                severity="info"
-            )
+            quotes_set["bid"].validator = MinMaxValidator(min=52, severity="info")
 
         :param check_type:  check feature type e.g. True, False
         :param severity:    severity name e.g. info, warning, etc.
@@ -346,9 +338,7 @@ class MinMaxLenValidator(Validator):
             # Add length validator to the feature 'ticker', where valid
             # minimal length is 1 and maximal length is 10
             quotes_set["ticker"].validator = MinMaxLenValidator(
-                min=1,
-                max=10,
-                severity="info"
+                min=1, max=10, severity="info"
             )
 
         :param check_type:  check feature type e.g. True, False
@@ -410,8 +400,7 @@ class RegexValidator(Validator):
             # expression '(\b[A-Za-z]{1}[0-9]{7}\b)' where valid values are
             # e.g. A1234567, z9874563, etc.
             quotes_set["name"].validator = RegexValidator(
-                regex=r"(\b[A-Za-z]{1}[0-9]{7}\b)",
-                severity="info"
+                regex=r"(\b[A-Za-z]{1}[0-9]{7}\b)", severity="info"
             )
 
         :param check_type:  check feature type e.g. True, False
@@ -445,7 +434,7 @@ class RegexValidator(Validator):
 
     @classmethod
     def from_dict(cls, struct=None, fields=None, deprecated_fields: dict = None):
-        new_obj = super(RegexValidator, cls).from_dict(
+        new_obj = super().from_dict(
             struct=struct, fields=fields, deprecated_fields=deprecated_fields
         )
         if hasattr(new_obj, "regex"):

mlrun/frameworks/_common/artifacts_library.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 from abc import ABC, abstractmethod
-from typing import Dict, List, Type, Union
+from typing import Union
 
 import mlrun
 
@@ -39,12 +39,12 @@ class ArtifactsLibrary(ABC):
     @classmethod
     def get_plans(
         cls,
-        artifacts: Union[List[Plan], Dict[str, dict], List[str]] = None,
+        artifacts: Union[list[Plan], dict[str, dict], list[str]] = None,
         context: mlrun.MLClientCtx = None,
         include_default: bool = True,
         # custom_plans: dict = None, :param custom_plans: Custom user plans objects to initialize from.
         **default_kwargs,
-    ) -> List[Plan]:
+    ) -> list[Plan]:
         """
         Get plans for a run. The plans will be taken from the provided artifacts / configuration via code, from provided
         configuration via MLRun context and if the 'include_default' is True, from the framework artifact library's
@@ -97,7 +97,7 @@ class ArtifactsLibrary(ABC):
 
     @classmethod
     @abstractmethod
-    def default(cls, **kwargs) -> List[Plan]:
+    def default(cls, **kwargs) -> list[Plan]:
         """
         Get the default artifacts plans list of this framework's library.
 
@@ -106,7 +106,7 @@ class ArtifactsLibrary(ABC):
         pass
 
     @classmethod
-    def _get_library_plans(cls) -> Dict[str, Type[Plan]]:
+    def _get_library_plans(cls) -> dict[str, type[Plan]]:
         """
         Get all the supported plans in this library.
 
@@ -120,8 +120,8 @@ class ArtifactsLibrary(ABC):
 
     @staticmethod
     def _from_dict(
-        requested_plans: Dict[str, dict], available_plans: Dict[str, Type[Plan]]
-    ) -> List[Plan]:
+        requested_plans: dict[str, dict], available_plans: dict[str, type[Plan]]
+    ) -> list[Plan]:
         """
         Initialize a list of plans from a given configuration dictionary. The configuration is expected to be a
         dictionary of plans and their initialization parameters in the following format:
@@ -162,8 +162,8 @@ class ArtifactsLibrary(ABC):
 
     @staticmethod
     def _from_list(
-        requested_plans: List[str], available_plans: Dict[str, Type[Plan]]
-    ) -> List[Plan]:
+        requested_plans: list[str], available_plans: dict[str, type[Plan]]
+    ) -> list[Plan]:
         """
         Initialize a list of plans from a given configuration list. The configuration is expected to be a list of plans
         names to be initialized with their default configuration.

mlrun/frameworks/_common/mlrun_interface.py

@@ -17,7 +17,7 @@ import functools
 import inspect
 from abc import ABC
 from types import FunctionType, MethodType
-from typing import Any, Dict, Generic, List, Tuple, Union
+from typing import Any, Generic, Union
 
 from .utils import CommonTypes
 
@@ -173,7 +173,7 @@ class MLRunInterface(ABC, Generic[CommonTypes.MLRunInterfaceableType]):
     def _insert_properties(
         cls,
         obj: CommonTypes.MLRunInterfaceableType,
-        properties: Dict[str, Any] = None,
+        properties: dict[str, Any] = None,
     ):
         """
         Insert the properties of the interface to the object. The properties default values are being copied (not deep
@@ -238,7 +238,7 @@ class MLRunInterface(ABC, Generic[CommonTypes.MLRunInterfaceableType]):
 
     @classmethod
     def _replace_properties(
-        cls, obj: CommonTypes.MLRunInterfaceableType, properties: Dict[str, Any] = None
+        cls, obj: CommonTypes.MLRunInterfaceableType, properties: dict[str, Any] = None
     ):
         """
         Replace the properties of the given object according to the configuration in the MLRun interface.
@@ -282,7 +282,7 @@ class MLRunInterface(ABC, Generic[CommonTypes.MLRunInterfaceableType]):
 
     @classmethod
     def _replace_functions(
-        cls, obj: CommonTypes.MLRunInterfaceableType, functions: List[str] = None
+        cls, obj: CommonTypes.MLRunInterfaceableType, functions: list[str] = None
     ):
         """
         Replace the functions / methods of the given object according to the configuration in the MLRun interface.
@@ -420,7 +420,7 @@ class MLRunInterface(ABC, Generic[CommonTypes.MLRunInterfaceableType]):
         passed_args: tuple = None,
         passed_kwargs: dict = None,
         default_value: Any = None,
-    ) -> Tuple[Any, Union[str, int, None]]:
+    ) -> tuple[Any, Union[str, int, None]]:
         """
         Get a passed argument (from *args or **kwargs) to a function. If the argument was not found the default value
         will be returned. In addition, the keyword of the argument in `kwargs` or the index of the argument in `args`

mlrun/frameworks/_common/model_handler.py

@@ -20,7 +20,7 @@ import sys
 import zipfile
 from abc import ABC, abstractmethod
 from types import MethodType
-from typing import Any, Dict, Generic, List, Type, Union
+from typing import Any, Generic, Union
 
 import numpy as np
 
@@ -57,10 +57,10 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
         model_path: CommonTypes.PathType = None,
         model_name: str = None,
         modules_map: Union[
-            Dict[str, Union[None, str, List[str]]], CommonTypes.PathType
+            dict[str, Union[None, str, list[str]]], CommonTypes.PathType
         ] = None,
         custom_objects_map: Union[
-            Dict[str, Union[str, List[str]]], CommonTypes.PathType
+            dict[str, Union[str, list[str]]], CommonTypes.PathType
         ] = None,
         custom_objects_directory: CommonTypes.PathType = None,
         context: MLClientCtx = None,
@@ -224,7 +224,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
         return self._tag
 
     @property
-    def inputs(self) -> Union[List[Feature], None]:
+    def inputs(self) -> Union[list[Feature], None]:
         """
         Get the input ports features list of this model's artifact. If the inputs are not set, None will be returned.
 
@@ -233,7 +233,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
         return self._inputs
 
     @property
-    def outputs(self) -> Union[List[Feature], None]:
+    def outputs(self) -> Union[list[Feature], None]:
         """
         Get the output ports features list of this model's artifact. If the outputs are not set, None will be returned.
 
@@ -242,7 +242,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
         return self._outputs
 
     @property
-    def labels(self) -> Dict[str, str]:
+    def labels(self) -> dict[str, str]:
         """
         Get the labels dictionary of this model's artifact. These will be the labels that will be logged with the model.
 
@@ -251,7 +251,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
         return self._labels
 
     @property
-    def parameters(self) -> Dict[str, str]:
+    def parameters(self) -> dict[str, str]:
         """
         Get the parameters dictionary of this model's artifact. These will be the parameters that will be logged with
         the model.
@@ -262,7 +262,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def get_artifacts(
         self, committed_only: bool = False
-    ) -> Dict[str, CommonTypes.ExtraDataType]:
+    ) -> dict[str, CommonTypes.ExtraDataType]:
         """
         Get the registered artifacts of this model's artifact. By default all the artifacts (logged and to be logged -
         committed only) will be returned. To get only the artifacts registered in the current run whom are committed and
@@ -306,7 +306,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
     def set_inputs(
         self,
         from_sample: CommonTypes.IOSampleType = None,
-        features: List[Feature] = None,
+        features: list[Feature] = None,
         **kwargs,
     ):
         """
@@ -335,7 +335,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
     def set_outputs(
         self,
         from_sample: CommonTypes.IOSampleType = None,
-        features: List[Feature] = None,
+        features: list[Feature] = None,
         **kwargs,
     ):
         """
@@ -363,8 +363,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def set_labels(
         self,
-        to_add: Dict[str, Union[str, int, float]] = None,
-        to_remove: List[str] = None,
+        to_add: dict[str, Union[str, int, float]] = None,
+        to_remove: list[str] = None,
     ):
         """
         Update the labels dictionary of this model artifact.
@@ -383,8 +383,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def set_parameters(
         self,
-        to_add: Dict[str, Union[str, int, float]] = None,
-        to_remove: List[str] = None,
+        to_add: dict[str, Union[str, int, float]] = None,
+        to_remove: list[str] = None,
     ):
         """
         Update the parameters dictionary of this model artifact.
@@ -403,8 +403,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def set_metrics(
         self,
-        to_add: Dict[str, CommonTypes.ExtraDataType] = None,
-        to_remove: List[str] = None,
+        to_add: dict[str, CommonTypes.ExtraDataType] = None,
+        to_remove: list[str] = None,
     ):
         """
         Update the metrics dictionary of this model artifact.
@@ -423,8 +423,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def set_extra_data(
         self,
-        to_add: Dict[str, CommonTypes.ExtraDataType] = None,
-        to_remove: List[str] = None,
+        to_add: dict[str, CommonTypes.ExtraDataType] = None,
+        to_remove: list[str] = None,
     ):
         """
         Update the extra data dictionary of this model artifact.
@@ -442,7 +442,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
                 self._extra_data.pop(label)
 
     def register_artifacts(
-        self, artifacts: Union[Artifact, List[Artifact], Dict[str, Artifact]]
+        self, artifacts: Union[Artifact, list[Artifact], dict[str, Artifact]]
     ):
         """
         Register the given artifacts, so they will be logged as extra data with the model of this handler. Notice: The
@@ -466,7 +466,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
     @abstractmethod
     def save(
         self, output_path: CommonTypes.PathType = None, **kwargs
-    ) -> Union[Dict[str, Artifact], None]:
+    ) -> Union[dict[str, Artifact], None]:
         """
         Save the handled model at the given output path.
 
@@ -525,13 +525,13 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
     def log(
         self,
         tag: str = "",
-        labels: Dict[str, Union[str, int, float]] = None,
-        parameters: Dict[str, Union[str, int, float]] = None,
-        inputs: List[Feature] = None,
-        outputs: List[Feature] = None,
-        metrics: Dict[str, Union[int, float]] = None,
-        artifacts: Dict[str, Artifact] = None,
-        extra_data: Dict[str, CommonTypes.ExtraDataType] = None,
+        labels: dict[str, Union[str, int, float]] = None,
+        parameters: dict[str, Union[str, int, float]] = None,
+        inputs: list[Feature] = None,
+        outputs: list[Feature] = None,
+        metrics: dict[str, Union[int, float]] = None,
+        artifacts: dict[str, Artifact] = None,
+        extra_data: dict[str, CommonTypes.ExtraDataType] = None,
         **kwargs,
     ):
         """
@@ -630,13 +630,13 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def update(
         self,
-        labels: Dict[str, Union[str, int, float]] = None,
-        parameters: Dict[str, Union[str, int, float]] = None,
-        inputs: List[Feature] = None,
-        outputs: List[Feature] = None,
-        metrics: Dict[str, Union[int, float]] = None,
-        artifacts: Dict[str, Artifact] = None,
-        extra_data: Dict[str, CommonTypes.ExtraDataType] = None,
+        labels: dict[str, Union[str, int, float]] = None,
+        parameters: dict[str, Union[str, int, float]] = None,
+        inputs: list[Feature] = None,
+        outputs: list[Feature] = None,
+        metrics: dict[str, Union[int, float]] = None,
+        artifacts: dict[str, Artifact] = None,
+        extra_data: dict[str, CommonTypes.ExtraDataType] = None,
         **kwargs,
     ):
         """
@@ -857,7 +857,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
         # Read the modules map if given as a json:
         if isinstance(self._modules_map, str):
-            with open(self._modules_map, "r") as map_json_file:
+            with open(self._modules_map) as map_json_file:
                 self._modules_map = json.loads(map_json_file.read())
 
         # Start importing the modules according to the map:
@@ -887,7 +887,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
         # Read the custom objects map if given as a json:
         if isinstance(self._custom_objects_map, str):
-            with open(self._custom_objects_map, "r") as map_json_file:
+            with open(self._custom_objects_map) as map_json_file:
                 self._custom_objects_map = json.loads(map_json_file.read())
 
         # Unzip the custom objects files if the directory was given as a zip:
@@ -917,7 +917,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
                 ),
             }
 
-    def _log_modules(self) -> Dict[str, Artifact]:
+    def _log_modules(self) -> dict[str, Artifact]:
         """
         Log the modules, returning the modules map json file logged as an artifact.
 
@@ -946,7 +946,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
         return artifacts
 
-    def _log_custom_objects(self) -> Dict[str, Artifact]:
+    def _log_custom_objects(self) -> dict[str, Artifact]:
         """
         Log the custom objects, returning their artifacts:
 
@@ -1002,8 +1002,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     def _read_io_samples(
         self,
-        samples: Union[CommonTypes.IOSampleType, List[CommonTypes.IOSampleType]],
-    ) -> List[Feature]:
+        samples: Union[CommonTypes.IOSampleType, list[CommonTypes.IOSampleType]],
+    ) -> list[Feature]:
         """
         Read the given inputs / output sample to / from the model into a list of MLRun Features (ports) to log in
         the model's artifact.
@@ -1062,7 +1062,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     @staticmethod
     def _validate_modules_parameter(
-        modules_map: Union[Dict[str, Union[None, str, List[str]]], str],
+        modules_map: Union[dict[str, Union[None, str, list[str]]], str],
     ):
         """
         Validate the given modules parameter.
@@ -1090,7 +1090,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     @staticmethod
     def _validate_custom_objects_parameters(
-        custom_objects_map: Union[Dict[str, Union[str, List[str]]], str],
+        custom_objects_map: Union[dict[str, Union[str, list[str]]], str],
         custom_objects_directory: str,
     ):
         """
@@ -1154,8 +1154,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     @staticmethod
     def _import_module(
-        module_path: str, objects_names: Union[List[str], None]
-    ) -> Dict[str, Any]:
+        module_path: str, objects_names: Union[list[str], None]
+    ) -> dict[str, Any]:
         """
         Import the given objects by their names from the given module path by the following rules:
 
@@ -1199,8 +1199,8 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
 
     @staticmethod
     def _import_custom_object(
-        py_file_path: str, objects_names: List[str]
-    ) -> Dict[str, Any]:
+        py_file_path: str, objects_names: list[str]
+    ) -> dict[str, Any]:
         """
         Import the given objects by their names from the given python file as: from 'py_file_path' import 'object_name'.
         If an object specified is already imported, a reference would simply be returned.
@@ -1232,7 +1232,7 @@ class ModelHandler(ABC, Generic[CommonTypes.ModelType, CommonTypes.IOSampleType]
         return objects_imports
 
 
-def with_mlrun_interface(interface: Type[MLRunInterface]):
+def with_mlrun_interface(interface: type[MLRunInterface]):
     """
     Decorator configure for decorating a ModelHandler method (expecting 'self' to be the first argument) to add the
     given MLRun interface into the model before executing the method and remove it afterwards.
@@ -1261,7 +1261,7 @@ def with_mlrun_interface(interface: Type[MLRunInterface]):
     return decorator
 
 
-def without_mlrun_interface(interface: Type[MLRunInterface]):
+def without_mlrun_interface(interface: type[MLRunInterface]):
     """
     Decorator configure for decorating a ModelHandler method (expecting 'self' to be the first argument) to remove the
     given MLRun interface from the model before executing the method and restore it afterwards.