mlrun 1.6.4rc7__py3-none-any.whl → 1.7.0__py3-none-any.whl

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.

mlrun/frameworks/_common/plan.py

@@ -11,13 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+
 from abc import ABC, abstractmethod
-from typing import Dict
 
 import mlrun
 from mlrun.artifacts import Artifact
-from mlrun.utils.helpers import is_ipython
+from mlrun.utils.helpers import is_jupyter
 
 
 class Plan(ABC):
@@ -33,7 +32,7 @@ class Plan(ABC):
         self._artifacts = {}  # type: Dict[str, Artifact]
 
     @property
-    def artifacts(self) -> Dict[str, Artifact]:
+    def artifacts(self) -> dict[str, Artifact]:
         """
         Get the plan's produced artifacts.
 
@@ -59,7 +58,7 @@ class Plan(ABC):
         pass
 
     @abstractmethod
-    def produce(self, *args, **kwargs) -> Dict[str, Artifact]:
+    def produce(self, *args, **kwargs) -> dict[str, Artifact]:
         """
         Produce the artifact according to this plan.
 
@@ -85,7 +84,7 @@ class Plan(ABC):
             return
 
         # Call the correct display method according to the kernel:
-        if is_ipython:
+        if is_jupyter:
             self._gui_display()
         else:
             self._cli_display()

mlrun/frameworks/_common/producer.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from typing import Dict, List
 
 import mlrun
 from mlrun.artifacts import Artifact
@@ -29,7 +28,7 @@ class Producer:
     def __init__(
         self,
         context: mlrun.MLClientCtx = None,
-        plans: List[Plan] = None,
+        plans: list[Plan] = None,
     ):
         """
         Initialize a producer with the given plans. The producer will log the produced artifacts using the given
@@ -68,7 +67,7 @@ class Producer:
         return self._context
 
     @property
-    def artifacts(self) -> Dict[str, Artifact]:
+    def artifacts(self) -> dict[str, Artifact]:
         """
         Get the logged artifacts.
 
@@ -92,7 +91,7 @@ class Producer:
         """
         self._context = context
 
-    def set_plans(self, plans: List[Plan]):
+    def set_plans(self, plans: list[Plan]):
         """
         Update the plans of this logger to the given list of plans here.
 

mlrun/frameworks/_common/utils.py

@@ -16,7 +16,7 @@ import re
 from abc import ABC
 from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, List, Tuple, TypeVar, Union
+from typing import Any, TypeVar, Union
 
 import numpy as np
 import pandas as pd
@@ -42,10 +42,10 @@ class CommonTypes(ABC):
     MLRunInterfaceableType = TypeVar("MLRunInterfaceableType")
 
     # Type for a MLRun Interface restoration tuple as returned from 'remove_interface':
-    MLRunInterfaceRestorationType = Tuple[
-        Dict[str, Any],  # Interface properties.
-        Dict[str, Any],  # Replaced properties.
-        List[str],  # Replaced methods and functions.
+    MLRunInterfaceRestorationType = tuple[
+        dict[str, Any],  # Interface properties.
+        dict[str, Any],  # Replaced properties.
+        list[str],  # Replaced methods and functions.
     ]
 
     # Common dataset type to all frameworks:

mlrun/frameworks/_dl_common/loggers/logger.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from typing import Dict, List
 
 import mlrun
 
@@ -79,7 +78,7 @@ class Logger:
         return self._mode
 
     @property
-    def training_results(self) -> Dict[str, List[List[float]]]:
+    def training_results(self) -> dict[str, list[list[float]]]:
         """
         Get the training results logged. The results will be stored in a dictionary where each key is the metric name
         and the value is a list of lists of values. The first list is by epoch and the second list is by iteration
@@ -90,7 +89,7 @@ class Logger:
         return self._training_results
 
     @property
-    def validation_results(self) -> Dict[str, List[List[float]]]:
+    def validation_results(self) -> dict[str, list[list[float]]]:
         """
         Get the validation results logged. The results will be stored in a dictionary where each key is the metric name
         and the value is a list of lists of values. The first list is by epoch and the second list is by iteration
@@ -101,7 +100,7 @@ class Logger:
         return self._validation_results
 
     @property
-    def training_summaries(self) -> Dict[str, List[float]]:
+    def training_summaries(self) -> dict[str, list[float]]:
         """
         Get the training summaries of the metrics results. The summaries will be stored in a dictionary where each key
         is the metric names and the value is a list of all the summary values per epoch.
@@ -111,7 +110,7 @@ class Logger:
         return self._training_summaries
 
     @property
-    def validation_summaries(self) -> Dict[str, List[float]]:
+    def validation_summaries(self) -> dict[str, list[float]]:
         """
         Get the validation summaries of the metrics results. The summaries will be stored in a dictionary where each key
         is the metric names and the value is a list of all the summary values per epoch.
@@ -121,7 +120,7 @@ class Logger:
         return self._validation_summaries
 
     @property
-    def static_hyperparameters(self) -> Dict[str, DLTypes.TrackableType]:
+    def static_hyperparameters(self) -> dict[str, DLTypes.TrackableType]:
         """
         Get the static hyperparameters logged. The hyperparameters will be stored in a dictionary where each key is the
         hyperparameter name and the value is his logged value.
@@ -131,7 +130,7 @@ class Logger:
         return self._static_hyperparameters
 
     @property
-    def dynamic_hyperparameters(self) -> Dict[str, List[DLTypes.TrackableType]]:
+    def dynamic_hyperparameters(self) -> dict[str, list[DLTypes.TrackableType]]:
         """
         Get the dynamic hyperparameters logged. The hyperparameters will be stored in a dictionary where each key is the
         hyperparameter name and the value is a list of his logged values per epoch.

mlrun/frameworks/_dl_common/loggers/mlrun_logger.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 import itertools
-from typing import Dict, List, Union
+from typing import Union
 
 import numpy as np
 import plotly.graph_objects as go
@@ -63,7 +63,7 @@ class MLRunLogger(Logger):
         :param context:              MLRun context to log to. The context parameters can be logged as static
                                      hyperparameters.
         """
-        super(MLRunLogger, self).__init__(context=context)
+        super().__init__(context=context)
 
         # Prepare the artifacts collection:
         self._artifacts = {}  # type: Dict[str, Artifact]
@@ -144,9 +144,9 @@ class MLRunLogger(Logger):
         self,
         model_handler: DLModelHandler,
         tag: str = "",
-        labels: Dict[str, DLTypes.TrackableType] = None,
-        parameters: Dict[str, DLTypes.TrackableType] = None,
-        extra_data: Dict[str, Union[DLTypes.TrackableType, Artifact]] = None,
+        labels: dict[str, DLTypes.TrackableType] = None,
+        parameters: dict[str, DLTypes.TrackableType] = None,
+        extra_data: dict[str, Union[DLTypes.TrackableType, Artifact]] = None,
     ):
         """
         Log the run, summarizing the validation metrics and dynamic hyperparameters across all epochs. If 'update' is
@@ -227,7 +227,7 @@ class MLRunLogger(Logger):
         # Commit to update the changes, so they will be available in the MLRun UI:
         self._context.commit(completed=False)
 
-    def _generate_metrics_summary(self) -> Dict[str, float]:
+    def _generate_metrics_summary(self) -> dict[str, float]:
         """
         Generate a metrics summary to log along the model.
 
@@ -254,7 +254,7 @@ class MLRunLogger(Logger):
 
     @staticmethod
     def _generate_metric_results_artifact(
-        loop: str, name: str, epochs_results: List[List[float]]
+        loop: str, name: str, epochs_results: list[list[float]]
     ) -> PlotlyArtifact:
         """
         Generate a plotly artifact for the results of the metric provided.
@@ -300,7 +300,7 @@ class MLRunLogger(Logger):
 
     @staticmethod
     def _generate_summary_results_artifact(
-        name: str, training_results: List[float], validation_results: List[float]
+        name: str, training_results: list[float], validation_results: list[float]
     ) -> PlotlyArtifact:
         """
         Generate a plotly artifact for the results summary across all the epochs of training.
@@ -351,7 +351,7 @@ class MLRunLogger(Logger):
 
     @staticmethod
     def _generate_dynamic_hyperparameter_values_artifact(
-        name: str, values: List[float]
+        name: str, values: list[float]
     ) -> PlotlyArtifact:
         """
         Generate a plotly artifact for the values of the hyperparameter provided.