mlrun 1.6.0rc35__py3-none-any.whl → 1.7.0rc2__py3-none-any.whl

mlrun/package/packagers/python_standard_library_packagers.py

@@ -15,7 +15,7 @@
 import os
 import pathlib
 import tempfile
-from typing import List, Tuple, Union
+from typing import Union
 
 from mlrun.artifacts import Artifact
 from mlrun.datastore import DataItem
@@ -45,7 +45,7 @@ class NonePackager(DefaultPackager):
     DEFAULT_PACKING_ARTIFACT_TYPE = ArtifactType.RESULT
 
     # TODO: `None` as pickle will be available from Python 3.10, so this method can be removed once we move to 3.10.
-    def get_supported_artifact_types(self) -> List[str]:
+    def get_supported_artifact_types(self) -> list[str]:
         """
         Get all the supported artifact types on this packager. It will be the same as `DefaultPackager` but without the
         'object' artifact type support (None cannot be pickled, only from Python 3.10, and it should not be pickled
@@ -96,7 +96,7 @@ class StrPackager(DefaultPackager):
 
     def pack_path(
         self, obj: str, key: str, archive_format: str = DEFAULT_ARCHIVE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a path string value content (pack the file or directory in that path).
 
@@ -198,7 +198,7 @@ class _BuiltinCollectionPackager(DefaultPackager):
         obj: Union[dict, list],
         key: str,
         file_format: str = DEFAULT_STRUCT_FILE_FORMAT,
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a builtin collection as a file by the given format.
 
@@ -343,7 +343,7 @@ class TuplePackager(ListPackager):
 
     def pack_file(
         self, obj: tuple, key: str, file_format: str = DEFAULT_STRUCT_FILE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a tuple as a file by the given format.
 
@@ -388,7 +388,7 @@ class SetPackager(ListPackager):
 
     def pack_file(
         self, obj: set, key: str, file_format: str = DEFAULT_STRUCT_FILE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a set as a file by the given format.
 
@@ -422,7 +422,7 @@ class FrozensetPackager(SetPackager):
 
     def pack_file(
         self, obj: frozenset, key: str, file_format: str = DEFAULT_STRUCT_FILE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a frozenset as a file by the given format.
 
@@ -469,7 +469,7 @@ class BytesPackager(ListPackager):
 
     def pack_file(
         self, obj: bytes, key: str, file_format: str = DEFAULT_STRUCT_FILE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a bytes as a file by the given format.
 
@@ -514,7 +514,7 @@ class BytearrayPackager(BytesPackager):
 
     def pack_file(
         self, obj: bytearray, key: str, file_format: str = DEFAULT_STRUCT_FILE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a bytearray as a file by the given format.
 
@@ -569,7 +569,7 @@ class PathPackager(StrPackager):
 
     def pack_path(
         self, obj: pathlib.Path, key: str, archive_format: str = DEFAULT_ARCHIVE_FORMAT
-    ) -> Tuple[Artifact, dict]:
+    ) -> tuple[Artifact, dict]:
         """
         Pack a `Path` value (pack the file or directory in that path).
 

mlrun/package/packagers_manager.py

@@ -16,9 +16,8 @@ import importlib
 import inspect
 import os
 import shutil
-import sys
 import traceback
-from typing import Any, Dict, List, Tuple, Type, Union
+from typing import Any, Union
 
 from mlrun.artifacts import Artifact
 from mlrun.datastore import DataItem, store_manager
@@ -42,7 +41,7 @@ class PackagersManager:
     It prepares the instructions / log hint configurations and then looks for the first packager that fits the task.
     """
 
-    def __init__(self, default_packager: Type[Packager] = None):
+    def __init__(self, default_packager: type[Packager] = None):
         """
         Initialize a packagers manager.
 
@@ -54,15 +53,15 @@ class PackagersManager:
         self._default_packager = (default_packager or DefaultPackager)()
 
         # Initialize the packagers list (with the default packager in it):
-        self._packagers: List[Packager] = []
+        self._packagers: list[Packager] = []
 
         # Set an artifacts list and results dictionary to collect all packed objects (will be used later to write extra
         # data if noted by the user using the log hint key "extra_data")
-        self._artifacts: List[Artifact] = []
+        self._artifacts: list[Artifact] = []
         self._results = {}
 
     @property
-    def artifacts(self) -> List[Artifact]:
+    def artifacts(self) -> list[Artifact]:
         """
         Get the artifacts that were packed by the manager.
 
@@ -80,7 +79,7 @@ class PackagersManager:
         return self._results
 
     def collect_packagers(
-        self, packagers: List[Union[Type[Packager], str]], default_priority: int = 5
+        self, packagers: list[Union[type[Packager], str]], default_priority: int = 5
     ):
         """
         Collect the provided packagers. Packagers passed as module paths are imported and validated to be of type
@@ -171,8 +170,8 @@ class PackagersManager:
         self._packagers.sort()
 
     def pack(
-        self, obj: Any, log_hint: Dict[str, str]
-    ) -> Union[Artifact, dict, None, List[Union[Artifact, dict, None]]]:
+        self, obj: Any, log_hint: dict[str, str]
+    ) -> Union[Artifact, dict, None, list[Union[Artifact, dict, None]]]:
         """
         Pack an object using one of the manager's packagers. A `dict` ("**") or `list` ("*") unpacking syntax in the
         log hint key packs the objects within them in separate packages.
@@ -244,7 +243,7 @@ class PackagersManager:
         # If multiple packages were packed, return a list, otherwise return the single package:
         return packages if len(packages) > 1 else packages[0]
 
-    def unpack(self, data_item: DataItem, type_hint: Type) -> Any:
+    def unpack(self, data_item: DataItem, type_hint: type) -> Any:
         """
         Unpack an object using one of the manager's packagers. The data item can be unpacked in two ways:
 
@@ -264,11 +263,7 @@ class PackagersManager:
         :return: The unpacked object parsed as type hinted.
         """
         # Check if `DataItem` is hinted - meaning the user can expect a data item and do not want to unpack it:
-        # TODO: Remove when we'll no longer support Python 3.7:
-        if sys.version_info[1] < 8:
-            if self._get_type_name(typ=DataItem) in str(type_hint):
-                return data_item
-        elif TypeHintUtils.is_matching(object_type=DataItem, type_hint=type_hint):
+        if TypeHintUtils.is_matching(object_type=DataItem, type_hint=type_hint):
             return data_item
 
         # Set variables to hold the manager notes and packager instructions:
@@ -306,7 +301,7 @@ class PackagersManager:
 
     def link_packages(
         self,
-        additional_artifacts: List[Artifact],
+        additional_artifacts: list[Artifact],
         additional_results: dict,
     ):
         """
@@ -371,7 +366,7 @@ class PackagersManager:
         ARTIFACT_TYPE = "artifact_type"
         INSTRUCTIONS = "instructions"
 
-    def _get_packagers_with_default_packager(self) -> List[Packager]:
+    def _get_packagers_with_default_packager(self) -> list[Packager]:
         """
         Get the full list of packagers - the collected packagers and the default packager (located at last place in the
         list - the lowest priority).
@@ -635,7 +630,7 @@ class PackagersManager:
             )
         return self._unpack_data_item(data_item=data_item, type_hint=type_hint)
 
-    def _unpack_data_item(self, data_item: DataItem, type_hint: Type):
+    def _unpack_data_item(self, data_item: DataItem, type_hint: type):
         """
         Unpack a data item to the desired hinted type. In case the type hint includes multiple types (as in the case of
         `typing.Union`), the manager goes over the types, and reduces them while looking for the first packager that
@@ -649,7 +644,7 @@ class PackagersManager:
         :raise MLRunPackageUnpackingError: If there is no packager that supports the provided type hint.
         """
         # Prepare a list of a packager and exception string for all the failures in case there was no fitting packager:
-        found_packagers: List[Tuple[Packager, str]] = []
+        found_packagers: list[tuple[Packager, str]] = []
 
         # Try to unpack as one of the possible types in the type hint:
         possible_type_hints = {type_hint}
@@ -718,7 +713,7 @@ class PackagersManager:
     @staticmethod
     def _look_for_extra_data(
         key: str,
-        artifacts: List[Artifact],
+        artifacts: list[Artifact],
         results: dict,
     ) -> Union[Artifact, str, int, float, None]:
         """
@@ -739,7 +734,7 @@ class PackagersManager:
         return results.get(key, None)
 
     @staticmethod
-    def _split_module_path(module_path: str) -> Tuple[str, str]:
+    def _split_module_path(module_path: str) -> tuple[str, str]:
         """
         Split a module path to the module name and the class name. Inner classes are not supported.
 
@@ -756,7 +751,7 @@ class PackagersManager:
         return module_name, class_name
 
     @staticmethod
-    def _get_type_name(typ: Type) -> str:
+    def _get_type_name(typ: type) -> str:
         """
         Get an object type full name - its module path. For example, the name of a pandas data frame is "DataFrame"
         but its full name (module path) is: "pandas.core.frame.DataFrame".
@@ -777,7 +772,7 @@ class PackagersManager:
         return f"{module_name}.{class_name}" if module_name else class_name
 
     @staticmethod
-    def _get_type_from_name(type_name: str) -> Type:
+    def _get_type_from_name(type_name: str) -> type:
         """
         Get the type object out of the given module path. The module must be a full module path (for example:
         "pandas.DataFrame" and not "DataFrame") otherwise it assumes to be from the local run module - __main__.

mlrun/package/utils/_formatter.py

@@ -82,7 +82,7 @@ class _JSONFormatter(_Formatter):
 
         :return: The read object.
         """
-        with open(file_path, "r") as file:
+        with open(file_path) as file:
             obj = json.load(file)
         return obj
 
@@ -117,7 +117,7 @@ class _JSONLFormatter(_Formatter):
 
         :return: The read object.
         """
-        with open(file_path, "r") as file:
+        with open(file_path) as file:
             lines = file.readlines()
 
         obj = []
@@ -157,7 +157,7 @@ class _YAMLFormatter(_Formatter):
 
         :return: The read object.
         """
-        with open(file_path, "r") as file:
+        with open(file_path) as file:
             obj = yaml.safe_load(file)
         return obj
 
@@ -188,7 +188,7 @@ class _TXTFormatter(_Formatter):
 
         :return: The read object.
         """
-        with open(file_path, "r") as file:
+        with open(file_path) as file:
             obj = ast.literal_eval(file.read())
         return obj
 

mlrun/package/utils/_pickler.py

@@ -19,7 +19,7 @@ import sys
 import tempfile
 import warnings
 from types import ModuleType
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Union
 
 from mlrun.errors import MLRunInvalidArgumentError
 from mlrun.utils import logger
@@ -35,7 +35,7 @@ class Pickler:
     @staticmethod
     def pickle(
         obj: Any, pickle_module_name: str, output_path: str = None
-    ) -> Tuple[str, Dict[str, Union[str, None]]]:
+    ) -> tuple[str, dict[str, Union[str, None]]]:
         """
         Pickle an object using the given module. The pickled object will be saved to file to the given output path.
 

mlrun/package/utils/_supported_format.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 from abc import ABC
-from typing import Dict, Generic, List, Type, TypeVar, Union
+from typing import Generic, TypeVar, Union
 
 # A generic type for a supported format handler class type:
 FileHandlerType = TypeVar("FileHandlerType")
@@ -29,10 +29,10 @@ class SupportedFormat(ABC, Generic[FileHandlerType]):
 
     # The map to use in the method `get_format_handler`. A dictionary of string key to a class type to handle that
     # format. New supported formats and handlers should be added to it:
-    _FORMAT_HANDLERS_MAP: Dict[str, Type[FileHandlerType]] = {}
+    _FORMAT_HANDLERS_MAP: dict[str, type[FileHandlerType]] = {}
 
     @classmethod
-    def get_all_formats(cls) -> List[str]:
+    def get_all_formats(cls) -> list[str]:
         """
         Get all supported formats.
 
@@ -45,7 +45,7 @@ class SupportedFormat(ABC, Generic[FileHandlerType]):
         ]
 
     @classmethod
-    def get_format_handler(cls, fmt: str) -> Type[FileHandlerType]:
+    def get_format_handler(cls, fmt: str) -> type[FileHandlerType]:
         """
         Get the format handler to the provided format (file extension):
 

mlrun/package/utils/log_hint_utils.py

@@ -35,8 +35,8 @@ class LogHintUtils:
 
     @staticmethod
     def parse_log_hint(
-        log_hint: typing.Union[typing.Dict[str, str], str, None],
-    ) -> typing.Union[typing.Dict[str, str], None]:
+        log_hint: typing.Union[dict[str, str], str, None],
+    ) -> typing.Union[dict[str, str], None]:
         """
         Parse a given log hint from string to a logging configuration dictionary. The string will be read as the
         artifact key ('key' in the dictionary) and if the string have a single colon, the following structure is

mlrun/package/utils/type_hint_utils.py

@@ -16,7 +16,6 @@ import builtins
 import importlib
 import itertools
 import re
-import sys
 import typing
 
 from mlrun.errors import MLRunInvalidArgumentError
@@ -151,7 +150,7 @@ class TypeHintUtils:
     @staticmethod
     def is_matching(
         object_type: type,
-        type_hint: typing.Union[type, typing.Set[type]],
+        type_hint: typing.Union[type, set[type]],
         include_subclasses: bool = True,
         reduce_type_hint: bool = True,
     ) -> bool:
@@ -189,8 +188,8 @@ class TypeHintUtils:
 
     @staticmethod
     def reduce_type_hint(
-        type_hint: typing.Union[type, typing.Set[type]],
-    ) -> typing.Set[type]:
+        type_hint: typing.Union[type, set[type]],
+    ) -> set[type]:
         """
         Reduce a type hint (or a set of type hints) using the `_reduce_type_hint` function.
 
@@ -212,7 +211,7 @@ class TypeHintUtils:
         )
 
     @staticmethod
-    def _reduce_type_hint(type_hint: type) -> typing.List[type]:
+    def _reduce_type_hint(type_hint: type) -> list[type]:
         """
         Reduce a type hint. If the type hint is a `typing` module, it will be reduced to its original hinted types. For
         example: `typing.Union[int, float, typing.List[int]]` will return `[int, float, List[int]]` and
@@ -225,10 +224,6 @@ class TypeHintUtils:
 
         :return: The reduced type hint as list of hinted types or an empty list if the type hint could not be reduced.
         """
-        # TODO: Remove when we'll no longer support Python 3.7:
-        if sys.version_info[1] < 8:
-            return []
-
         # If it's not a typing type (meaning it's an actual object type) then we can't reduce it further:
         if not TypeHintUtils.is_typing_type(type_hint=type_hint):
             return []

mlrun/platforms/other.py

@@ -14,7 +14,6 @@
 #
 # this file is based on the code from kubeflow pipelines git
 import os
-from typing import Dict
 
 import kfp.dsl
 
@@ -274,7 +273,7 @@ def mount_s3(
     return _use_s3_cred
 
 
-def set_env_variables(env_vars_dict: Dict[str, str] = None, **kwargs):
+def set_env_variables(env_vars_dict: dict[str, str] = None, **kwargs):
     """
     Modifier function to apply a set of environment variables to a runtime. Variables may be passed
     as either a dictionary of name-value pairs, or as arguments to the function.

mlrun/projects/operations.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 import warnings
-from typing import Dict, List, Optional, Union
+from typing import Optional, Union
 
 import kfp
 
@@ -61,7 +61,7 @@ def run_function(
     hyperparams: dict = None,
     hyper_param_options: mlrun.model.HyperParamOptions = None,
     inputs: dict = None,
-    outputs: List[str] = None,
+    outputs: list[str] = None,
     workdir: str = "",
     labels: dict = None,
     base_task: mlrun.model.RunTemplate = None,
@@ -73,8 +73,8 @@ def run_function(
     auto_build: bool = None,
     schedule: Union[str, mlrun.common.schemas.ScheduleCronTrigger] = None,
     artifact_path: str = None,
-    notifications: List[mlrun.model.Notification] = None,
-    returns: Optional[List[Union[str, Dict[str, str]]]] = None,
+    notifications: list[mlrun.model.Notification] = None,
+    returns: Optional[list[Union[str, dict[str, str]]]] = None,
     builder_env: Optional[list] = None,
 ) -> Union[mlrun.model.RunObject, kfp.dsl.ContainerOp]:
     """Run a local or remote task as part of a local/kubeflow pipeline
@@ -239,7 +239,7 @@ def build_function(
     base_image=None,
     commands: list = None,
     secret_name=None,
-    requirements: Union[str, List[str]] = None,
+    requirements: Union[str, list[str]] = None,
     requirements_file: str = None,
     mlrun_version_specifier=None,
     builder_env: dict = None,

mlrun/projects/pipelines.py

@@ -312,9 +312,9 @@ def _enrich_kfp_pod_security_context(kfp_pod_template, function):
 def _create_enriched_mlrun_workflow(
     self,
     pipeline_func: typing.Callable,
-    pipeline_name: typing.Optional[typing.Text] = None,
-    pipeline_description: typing.Optional[typing.Text] = None,
-    params_list: typing.Optional[typing.List[dsl.PipelineParam]] = None,
+    pipeline_name: typing.Optional[str] = None,
+    pipeline_description: typing.Optional[str] = None,
+    params_list: typing.Optional[list[dsl.PipelineParam]] = None,
     pipeline_conf: typing.Optional[dsl.PipelineConf] = None,
 ):
     """Call internal implementation of create_workflow and enrich with mlrun functions attributes"""
@@ -425,7 +425,7 @@ class _PipelineRunStatus:
     def __init__(
         self,
         run_id: str,
-        engine: typing.Type["_PipelineRunner"],
+        engine: type["_PipelineRunner"],
         project: "mlrun.projects.MlrunProject",
         workflow: WorkflowSpec = None,
         state: str = "",
@@ -496,7 +496,7 @@ class _PipelineRunner(abc.ABC):
         artifact_path=None,
         namespace=None,
         source=None,
-        notifications: typing.List[mlrun.model.Notification] = None,
+        notifications: list[mlrun.model.Notification] = None,
     ) -> _PipelineRunStatus:
         pass
 
@@ -574,7 +574,7 @@ class _KFPRunner(_PipelineRunner):
         artifact_path=None,
         namespace=None,
         source=None,
-        notifications: typing.List[mlrun.model.Notification] = None,
+        notifications: list[mlrun.model.Notification] = None,
     ) -> _PipelineRunStatus:
         pipeline_context.set(project, workflow_spec)
         workflow_handler = _PipelineRunner._get_handler(
@@ -717,7 +717,7 @@ class _LocalRunner(_PipelineRunner):
         artifact_path=None,
         namespace=None,
         source=None,
-        notifications: typing.List[mlrun.model.Notification] = None,
+        notifications: list[mlrun.model.Notification] = None,
     ) -> _PipelineRunStatus:
         pipeline_context.set(project, workflow_spec)
         workflow_handler = _PipelineRunner._get_handler(
@@ -806,7 +806,7 @@ class _RemoteRunner(_PipelineRunner):
         artifact_path: str = None,
         namespace: str = None,
         source: str = None,
-        notifications: typing.List[mlrun.model.Notification] = None,
+        notifications: list[mlrun.model.Notification] = None,
     ) -> typing.Optional[_PipelineRunStatus]:
         workflow_name = normalize_workflow_name(name=name, project_name=project.name)
         workflow_id = None
@@ -976,7 +976,7 @@ def load_and_run(
     save: bool = True,
     workflow_name: str = None,
     workflow_path: str = None,
-    workflow_arguments: typing.Dict[str, typing.Any] = None,
+    workflow_arguments: dict[str, typing.Any] = None,
     artifact_path: str = None,
     workflow_handler: typing.Union[str, typing.Callable] = None,
     namespace: str = None,