mlrun 1.6.3__py3-none-any.whl → 1.6.3rc2__py3-none-any.whl

mlrun/config.py

@@ -672,10 +672,6 @@ default_config = {
         "access_key": "",
     },
     "grafana_url": "",
-    "auth_with_client_id": {
-        "enabled": False,
-        "request_timeout": 5,
-    },
 }
 
 _is_running_as_api = None
@@ -1066,7 +1062,7 @@ class Config:
         target: str = "online",
         artifact_path: str = None,
         application_name: str = None,
-    ) -> typing.Union[str, list[str]]:
+    ) -> str:
         """Get the full path from the configuration based on the provided project and kind.
 
         :param project:         Project name.
@@ -1082,8 +1078,7 @@ class Config:
                                 relative artifact path will be taken from the global MLRun artifact path.
         :param application_name:    Application name, None for model_monitoring_stream.
 
-        :return:                Full configured path for the provided kind. Can be either a single path
-                                or a list of paths in the case of the online model monitoring stream path.
+        :return:                Full configured path for the provided kind.
         """
 
         if target != "offline":
@@ -1104,22 +1099,12 @@ class Config:
                     if application_name is None
                     else f"{kind}-{application_name.lower()}",
                 )
-            elif kind == "stream":  # return list for mlrun<1.6.3 BC
-                return [
-                    mlrun.mlconf.model_endpoint_monitoring.store_prefixes.default.format(
-                        project=project,
-                        kind=kind,
-                    ),  # old stream uri (pipelines) for BC ML-6043
-                    mlrun.mlconf.model_endpoint_monitoring.store_prefixes.user_space.format(
-                        project=project,
-                        kind=kind,
-                    ),  # new stream uri (projects)
-                ]
-            else:
-                return mlrun.mlconf.model_endpoint_monitoring.store_prefixes.default.format(
-                    project=project,
-                    kind=kind,
-                )
+            return mlrun.mlconf.model_endpoint_monitoring.store_prefixes.default.format(
+                project=project,
+                kind=kind
+                if application_name is None
+                else f"{kind}-{application_name.lower()}",
+            )
 
         # Get the current offline path from the configuration
         file_path = mlrun.mlconf.model_endpoint_monitoring.offline_storage_path.format(
@@ -1376,14 +1361,10 @@ def read_env(env=None, prefix=env_prefix):
     if log_formatter_name := config.get("log_formatter"):
         import mlrun.utils.logger
 
-        log_formatter = mlrun.utils.resolve_formatter_by_kind(
+        log_formatter = mlrun.utils.create_formatter_instance(
             mlrun.utils.FormatterKinds(log_formatter_name)
         )
-        current_handler = mlrun.utils.logger.get_handler("default")
-        current_formatter_name = current_handler.formatter.__class__.__name__
-        desired_formatter_name = log_formatter.__name__
-        if current_formatter_name != desired_formatter_name:
-            current_handler.setFormatter(log_formatter())
+        mlrun.utils.logger.get_handler("default").setFormatter(log_formatter)
 
     # The default function pod resource values are of type str; however, when reading from environment variable numbers,
     # it converts them to type int if contains only number, so we want to convert them to str.

mlrun/datastore/helpers.py

@@ -0,0 +1,18 @@
+# Copyright 2023 Iguazio
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+
+ONE_GB = 1024 * 1024 * 1024
+ONE_MB = 1024 * 1024

mlrun/datastore/v3io.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import mmap
+import os
 import time
 from datetime import datetime
 
@@ -20,6 +22,7 @@ import v3io
 from v3io.dataplane.response import HttpResponseError
 
 import mlrun
+from mlrun.datastore.helpers import ONE_GB, ONE_MB
 
 from ..platforms.iguazio import parse_path, split_path
 from .base import (
@@ -29,7 +32,6 @@ from .base import (
 )
 
 V3IO_LOCAL_ROOT = "v3io"
-V3IO_DEFAULT_UPLOAD_CHUNK_SIZE = 1024 * 1024 * 100
 
 
 class V3ioStore(DataStore):
@@ -92,28 +94,46 @@ class V3ioStore(DataStore):
         )
         return self._sanitize_storage_options(res)
 
-    def _upload(
-        self,
-        key: str,
-        src_path: str,
-        max_chunk_size: int = V3IO_DEFAULT_UPLOAD_CHUNK_SIZE,
-    ):
+    def _upload(self, key: str, src_path: str, max_chunk_size: int = ONE_GB):
         """helper function for upload method, allows for controlling max_chunk_size in testing"""
         container, path = split_path(self._join(key))
+        file_size = os.path.getsize(src_path)  # in bytes
+        if file_size <= ONE_MB:
+            with open(src_path, "rb") as source_file:
+                data = source_file.read()
+            self._do_object_request(
+                self.object.put,
+                container=container,
+                path=path,
+                body=data,
+                append=False,
+            )
+            return
+        # chunk must be a multiple of the ALLOCATIONGRANULARITY
+        # https://docs.python.org/3/library/mmap.html
+        if residue := max_chunk_size % mmap.ALLOCATIONGRANULARITY:
+            # round down to the nearest multiple of ALLOCATIONGRANULARITY
+            max_chunk_size -= residue
+
         with open(src_path, "rb") as file_obj:
-            append = False
-            while True:
-                data = memoryview(file_obj.read(max_chunk_size))
-                if not data:
-                    break
-                self._do_object_request(
-                    self.object.put,
-                    container=container,
-                    path=path,
-                    body=data,
-                    append=append,
-                )
-                append = True
+            file_offset = 0
+            while file_offset < file_size:
+                chunk_size = min(file_size - file_offset, max_chunk_size)
+                with mmap.mmap(
+                    file_obj.fileno(),
+                    length=chunk_size,
+                    access=mmap.ACCESS_READ,
+                    offset=file_offset,
+                ) as mmap_obj:
+                    append = file_offset != 0
+                    self._do_object_request(
+                        self.object.put,
+                        container=container,
+                        path=path,
+                        body=mmap_obj,
+                        append=append,
+                    )
+                    file_offset += chunk_size
 
     def upload(self, key, src_path):
         return self._upload(key, src_path)
@@ -128,16 +148,19 @@ class V3ioStore(DataStore):
             num_bytes=size,
         ).body
 
-    def _put(
-        self,
-        key,
-        data,
-        append=False,
-        max_chunk_size: int = V3IO_DEFAULT_UPLOAD_CHUNK_SIZE,
-    ):
+    def _put(self, key, data, append=False, max_chunk_size: int = ONE_GB):
         """helper function for put method, allows for controlling max_chunk_size in testing"""
         container, path = split_path(self._join(key))
         buffer_size = len(data)  # in bytes
+        if buffer_size <= ONE_MB:
+            self._do_object_request(
+                self.object.put,
+                container=container,
+                path=path,
+                body=data,
+                append=append,
+            )
+            return
         buffer_offset = 0
         try:
             data = memoryview(data)

mlrun/db/httpdb.py

@@ -33,7 +33,6 @@ import mlrun.common.schemas
 import mlrun.model_monitoring.model_endpoint
 import mlrun.platforms
 import mlrun.projects
-from mlrun.db.auth_utils import OAuthClientIDTokenProvider, StaticTokenProvider
 from mlrun.errors import MLRunInvalidArgumentError, err_to_str
 
 from ..artifacts import Artifact
@@ -134,28 +133,17 @@ class HTTPRunDB(RunDBInterface):
             endpoint += f":{parsed_url.port}"
         base_url = f"{parsed_url.scheme}://{endpoint}{parsed_url.path}"
 
-        self.base_url = base_url
         username = parsed_url.username or config.httpdb.user
         password = parsed_url.password or config.httpdb.password
-        self.token_provider = None
-
-        if config.auth_with_client_id.enabled:
-            self.token_provider = OAuthClientIDTokenProvider(
-                token_endpoint=mlrun.get_secret_or_env("MLRUN_AUTH_TOKEN_ENDPOINT"),
-                client_id=mlrun.get_secret_or_env("MLRUN_AUTH_CLIENT_ID"),
-                client_secret=mlrun.get_secret_or_env("MLRUN_AUTH_CLIENT_SECRET"),
-                timeout=config.auth_with_client_id.request_timeout,
-            )
-        else:
-            username, password, token = mlrun.platforms.add_or_refresh_credentials(
-                parsed_url.hostname, username, password, config.httpdb.token
-            )
 
-            if token:
-                self.token_provider = StaticTokenProvider(token)
+        username, password, token = mlrun.platforms.add_or_refresh_credentials(
+            parsed_url.hostname, username, password, config.httpdb.token
+        )
 
+        self.base_url = base_url
         self.user = username
         self.password = password
+        self.token = token
 
     def __repr__(self):
         cls = self.__class__.__name__
@@ -225,19 +213,17 @@ class HTTPRunDB(RunDBInterface):
 
         if self.user:
             kw["auth"] = (self.user, self.password)
-        elif self.token_provider:
-            token = self.token_provider.get_token()
-            if token:
-                # Iguazio auth doesn't support passing token through bearer, so use cookie instead
-                if self.token_provider.is_iguazio_session():
-                    session_cookie = f'j:{{"sid": "{token}"}}'
-                    cookies = {
-                        "session": session_cookie,
-                    }
-                    kw["cookies"] = cookies
-                else:
-                    if "Authorization" not in kw.setdefault("headers", {}):
-                        kw["headers"].update({"Authorization": "Bearer " + token})
+        elif self.token:
+            # Iguazio auth doesn't support passing token through bearer, so use cookie instead
+            if mlrun.platforms.iguazio.is_iguazio_session(self.token):
+                session_cookie = f'j:{{"sid": "{self.token}"}}'
+                cookies = {
+                    "session": session_cookie,
+                }
+                kw["cookies"] = cookies
+            else:
+                if "Authorization" not in kw.setdefault("headers", {}):
+                    kw["headers"].update({"Authorization": "Bearer " + self.token})
 
         if mlrun.common.schemas.HeaderNames.client_version not in kw.setdefault(
             "headers", {}
@@ -944,7 +930,6 @@ class HTTPRunDB(RunDBInterface):
         kind: str = None,
         category: Union[str, mlrun.common.schemas.ArtifactCategories] = None,
         tree: str = None,
-        producer_uri: str = None,
     ) -> ArtifactList:
         """List artifacts filtered by various parameters.
 
@@ -971,12 +956,9 @@ class HTTPRunDB(RunDBInterface):
         :param best_iteration: Returns the artifact which belongs to the best iteration of a given run, in the case of
             artifacts generated from a hyper-param run. If only a single iteration exists, will return the artifact
             from that iteration. If using ``best_iter``, the ``iter`` parameter must not be used.
-        :param kind:            Return artifacts of the requested kind.
-        :param category:        Return artifacts of the requested category.
-        :param tree:            Return artifacts of the requested tree.
-        :param producer_uri:    Return artifacts produced by the requested producer URI. Producer URI usually
-            points to a run and is used to filter artifacts by the run that produced them when the artifact producer id
-            is a workflow id (artifact was created as part of a workflow).
+        :param kind: Return artifacts of the requested kind.
+        :param category: Return artifacts of the requested category.
+        :param tree: Return artifacts of the requested tree.
         """
 
         project = project or config.default_project
@@ -995,7 +977,6 @@ class HTTPRunDB(RunDBInterface):
             "category": category,
             "tree": tree,
             "format": mlrun.common.schemas.ArtifactsFormat.full.value,
-            "producer_uri": producer_uri,
         }
         error = "list artifacts"
         endpoint_path = f"projects/{project}/artifacts"

mlrun/lists.py

@@ -36,7 +36,6 @@ list_header = [
     "parameters",
     "results",
     "artifacts",
-    "artifact_uris",
     "error",
 ]
 
@@ -64,7 +63,6 @@ class RunList(list):
                 get_in(run, "spec.parameters", ""),
                 get_in(run, "status.results", ""),
                 get_in(run, "status.artifacts", []),
-                get_in(run, "status.artifact_uris", {}),
                 get_in(run, "status.error", ""),
             ]
             if extend_iterations and iterations:

mlrun/model.py

@@ -624,11 +624,6 @@ class RunMetadata(ModelObj):
     def iteration(self, iteration):
         self._iteration = iteration
 
-    def is_workflow_runner(self):
-        if not self.labels:
-            return False
-        return self.labels.get("job-type", "") == "workflow-runner"
-
 
 class HyperParamStrategies:
     grid = "grid"
@@ -1058,7 +1053,6 @@ class RunStatus(ModelObj):
         ui_url=None,
         reason: str = None,
         notifications: Dict[str, Notification] = None,
-        artifact_uris: dict[str, str] = None,
     ):
         self.state = state or "created"
         self.status_text = status_text
@@ -1073,21 +1067,6 @@ class RunStatus(ModelObj):
         self.ui_url = ui_url
         self.reason = reason
         self.notifications = notifications or {}
-        # Artifact key -> URI mapping, since the full artifacts are not stored in the runs DB table
-        self.artifact_uris = artifact_uris or {}
-
-    def is_failed(self) -> Optional[bool]:
-        """
-        This method returns whether a run has failed.
-        Returns none if state has yet to be defined. callee is responsible for handling None.
-        (e.g wait for state to be defined)
-        """
-        if not self.state:
-            return None
-        return self.state.casefold() in [
-            mlrun.run.RunStatuses.failed.casefold(),
-            mlrun.run.RunStatuses.error.casefold(),
-        ]
 
 
 class RunTemplate(ModelObj):
@@ -1387,10 +1366,8 @@ class RunObject(RunTemplate):
             iter=self.metadata.iteration,
         )
         if run:
-            run_status = run.get("status", {})
-            # Artifacts are not stored in the DB, so we need to preserve them here
-            run_status["artifacts"] = self.status.artifacts
-            self.status = RunStatus.from_dict(run_status)
+            self.status = RunStatus.from_dict(run.get("status", {}))
+            self.status.from_dict(run.get("status", {}))
             return self
 
     def show(self):

mlrun/model_monitoring/features_drift_table.py

@@ -19,7 +19,6 @@ import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 
 import mlrun.common.schemas.model_monitoring
-import mlrun.common.schemas.model_monitoring.constants as mm_constants
 
 # A type for representing a drift result, a tuple of the status and the drift mean:
 DriftResultType = Tuple[mlrun.common.schemas.model_monitoring.DriftStatus, float]
@@ -113,11 +112,6 @@ class FeaturesDriftTablePlot:
         :return: The full path to the html file of the plot.
         """
         # Plot the drift table:
-        features = [
-            feature
-            for feature in features
-            if feature not in mm_constants.FeatureSetFeatures.list()
-        ]
         figure = self._plot(
             features=features,
             sample_set_statistics=sample_set_statistics,

mlrun/model_monitoring/helpers.py

@@ -41,7 +41,7 @@ class _MLRunNoRunsFoundError(Exception):
     pass
 
 
-def get_stream_path(project: str = None, application_name: str = None) -> str:
+def get_stream_path(project: str = None, application_name: str = None):
     """
     Get stream path from the project secret. If wasn't set, take it from the system configurations
 
@@ -62,9 +62,6 @@ def get_stream_path(project: str = None, application_name: str = None) -> str:
         application_name=application_name,
     )
 
-    if isinstance(stream_uri, list):  # ML-6043 - user side gets only the new stream uri
-        stream_uri = stream_uri[1]
-
     return mlrun.common.model_monitoring.helpers.parse_monitoring_stream_path(
         stream_uri=stream_uri, project=project, application_name=application_name
     )

mlrun/model_monitoring/stream_processing.py

@@ -350,6 +350,7 @@ class EventStreamProcessor:
                     rate="10/m",
                     time_col=EventFieldType.TIMESTAMP,
                     container=self.tsdb_container,
+                    access_key=self.v3io_access_key,
                     v3io_frames=self.v3io_framesd,
                     infer_columns_from_data=True,
                     index_cols=[

mlrun/projects/pipelines.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import abc
 import builtins
-import http
 import importlib.util as imputil
 import os
 import tempfile
@@ -878,33 +877,17 @@ class _RemoteRunner(_PipelineRunner):
                 get_workflow_id_timeout=get_workflow_id_timeout,
             )
 
-            def _get_workflow_id_or_bail():
-                try:
-                    return run_db.get_workflow_id(
-                        project=project.name,
-                        name=workflow_response.name,
-                        run_id=workflow_response.run_id,
-                        engine=workflow_spec.engine,
-                    )
-                except mlrun.errors.MLRunHTTPStatusError as get_wf_exc:
-                    # fail fast on specific errors
-                    if get_wf_exc.error_status_code in [
-                        http.HTTPStatus.PRECONDITION_FAILED
-                    ]:
-                        raise mlrun.errors.MLRunFatalFailureError(
-                            original_exception=get_wf_exc
-                        )
-
-                    # raise for a retry (on other errors)
-                    raise
-
             # Getting workflow id from run:
             response = retry_until_successful(
                 1,
                 get_workflow_id_timeout,
                 logger,
                 False,
-                _get_workflow_id_or_bail,
+                run_db.get_workflow_id,
+                project=project.name,
+                name=workflow_response.name,
+                run_id=workflow_response.run_id,
+                engine=workflow_spec.engine,
             )
             workflow_id = response.workflow_id
             # After fetching the workflow_id the workflow executed successfully

mlrun/projects/project.py

@@ -2650,14 +2650,12 @@ class MlrunProject(ModelObj):
                 "Remote repo is not defined, use .create_remote() + push()"
             )
 
-        if engine not in ["remote"]:
-            # for remote runs we don't require the functions to be synced as they can be loaded dynamically during run
-            self.sync_functions(always=sync)
-            if not self.spec._function_objects:
-                raise ValueError(
-                    "There are no functions in the project."
-                    " Make sure you've set your functions with project.set_function()."
-                )
+        self.sync_functions(always=sync)
+        if not self.spec._function_objects:
+            raise ValueError(
+                "There are no functions in the project."
+                " Make sure you've set your functions with project.set_function()."
+            )
 
         if not name and not workflow_path and not workflow_handler:
             raise ValueError("Workflow name, path, or handler must be specified")

mlrun/render.py

@@ -134,7 +134,7 @@ def artifacts_html(
 
         if not attribute_value:
             mlrun.utils.logger.warning(
-                f"Artifact required attribute {attribute_name} is missing, omitting from output",
+                "Artifact is incomplete, omitting from output (most likely due to a failed artifact logging)",
                 artifact_key=key,
             )
             continue
@@ -404,21 +404,12 @@ def runs_to_html(
         df.drop("labels", axis=1, inplace=True)
         df.drop("inputs", axis=1, inplace=True)
         df.drop("artifacts", axis=1, inplace=True)
-        df.drop("artifact_uris", axis=1, inplace=True)
     else:
         df["labels"] = df["labels"].apply(dict_html)
         df["inputs"] = df["inputs"].apply(inputs_html)
-        if df["artifacts"][0]:
-            df["artifacts"] = df["artifacts"].apply(
-                lambda artifacts: artifacts_html(artifacts, "target_path"),
-            )
-            df.drop("artifact_uris", axis=1, inplace=True)
-        elif df["artifact_uris"][0]:
-            df["artifact_uris"] = df["artifact_uris"].apply(dict_html)
-            df.drop("artifacts", axis=1, inplace=True)
-        else:
-            df.drop("artifacts", axis=1, inplace=True)
-            df.drop("artifact_uris", axis=1, inplace=True)
+        df["artifacts"] = df["artifacts"].apply(
+            lambda artifacts: artifacts_html(artifacts, "target_path"),
+        )
 
     def expand_error(x):
         if x["state"] == "error":

mlrun/runtimes/pod.py

@@ -1012,12 +1012,12 @@ class KubeResource(BaseRuntime):
 
     def _set_env(self, name, value=None, value_from=None):
         new_var = k8s_client.V1EnvVar(name=name, value=value, value_from=value_from)
-
-        # ensure we don't have duplicate env vars with the same name
-        for env_index, value_item in enumerate(self.spec.env):
-            if get_item_name(value_item) == name:
-                self.spec.env[env_index] = new_var
+        i = 0
+        for v in self.spec.env:
+            if get_item_name(v) == name:
+                self.spec.env[i] = new_var
                 return self
+            i += 1
         self.spec.env.append(new_var)
         return self
 

mlrun/utils/async_http.py

@@ -24,7 +24,7 @@ from aiohttp_retry import ExponentialRetry, RequestParams, RetryClient, RetryOpt
 from aiohttp_retry.client import _RequestContext
 
 from mlrun.config import config
-from mlrun.errors import err_to_str, raise_for_status
+from mlrun.errors import err_to_str
 
 from .helpers import logger as mlrun_logger
 
@@ -48,21 +48,12 @@ class AsyncClientWithRetry(RetryClient):
         *args,
         **kwargs,
     ):
-        # do not retry on PUT / PATCH as they might have side effects (not truly idempotent)
-        blacklisted_methods = (
-            blacklisted_methods
-            if blacklisted_methods is not None
-            else [
-                "POST",
-                "PUT",
-                "PATCH",
-            ]
-        )
         super().__init__(
             *args,
             retry_options=ExponentialRetryOverride(
                 retry_on_exception=retry_on_exception,
-                blacklisted_methods=blacklisted_methods,
+                # do not retry on PUT / PATCH as they might have side effects (not truly idempotent)
+                blacklisted_methods=blacklisted_methods or ["POST", "PUT", "PATCH"],
                 attempts=max_retries,
                 statuses=retry_on_status_codes,
                 factor=retry_backoff_factor,
@@ -74,12 +65,6 @@ class AsyncClientWithRetry(RetryClient):
             **kwargs,
         )
 
-    def methods_blacklist_update_required(self, new_blacklist: str):
-        self._retry_options: ExponentialRetryOverride
-        return set(self._retry_options.blacklisted_methods).difference(
-            set(new_blacklist)
-        )
-
     def _make_requests(
         self,
         params_list: List[RequestParams],
@@ -190,7 +175,7 @@ class _CustomRequestContext(_RequestContext):
                 last_attempt = current_attempt == self._retry_options.attempts
                 if self._is_status_code_ok(response.status) or last_attempt:
                     if self._raise_for_status:
-                        raise_for_status(response)
+                        response.raise_for_status()
 
                     self._response = response
                     return response
@@ -292,11 +277,6 @@ class _CustomRequestContext(_RequestContext):
                 if isinstance(exc.os_error, exc_type):
                     return
         if exc.__cause__:
-            # If the cause exception is retriable, return, otherwise, raise the original exception
-            try:
-                self.verify_exception_type(exc.__cause__)
-            except Exception:
-                raise exc
-            return
+            return self.verify_exception_type(exc.__cause__)
         else:
             raise exc

mlrun/utils/logger.py

@@ -14,7 +14,6 @@
 
 import json
 import logging
-import typing
 from enum import Enum
 from sys import stdout
 from traceback import format_exception
@@ -187,15 +186,11 @@ class FormatterKinds(Enum):
     JSON = "json"
 
 
-def resolve_formatter_by_kind(
-    formatter_kind: FormatterKinds,
-) -> typing.Type[
-    typing.Union[HumanReadableFormatter, HumanReadableExtendedFormatter, JSONFormatter]
-]:
+def create_formatter_instance(formatter_kind: FormatterKinds) -> logging.Formatter:
     return {
-        FormatterKinds.HUMAN: HumanReadableFormatter,
-        FormatterKinds.HUMAN_EXTENDED: HumanReadableExtendedFormatter,
-        FormatterKinds.JSON: JSONFormatter,
+        FormatterKinds.HUMAN: HumanReadableFormatter(),
+        FormatterKinds.HUMAN_EXTENDED: HumanReadableExtendedFormatter(),
+        FormatterKinds.JSON: JSONFormatter(),
     }[formatter_kind]
 
 
@@ -213,11 +208,11 @@ def create_logger(
     logger_instance = Logger(level, name=name, propagate=False)
 
     # resolve formatter
-    formatter_instance = resolve_formatter_by_kind(
+    formatter_instance = create_formatter_instance(
         FormatterKinds(formatter_kind.lower())
     )
 
     # set handler
-    logger_instance.set_handler("default", stream or stdout, formatter_instance())
+    logger_instance.set_handler("default", stream or stdout, formatter_instance)
 
     return logger_instance

mlrun/utils/version/version.json

@@ -1,4 +1,4 @@
 {
-  "git_commit": "43c50e9853e34113270e42ef4b4ccc1b0cdb28cb",
-  "version": "1.6.3"
+  "git_commit": "e48bcf64d5c6c36239e481620674182e88911c68",
+  "version": "1.6.3-rc2"
 }

{mlrun-1.6.3.dist-info → mlrun-1.6.3rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlrun
-Version: 1.6.3
+Version: 1.6.3rc2
 Summary: Tracking and config of machine learning runs
 Home-page: https://github.com/mlrun/mlrun
 Author: Yaron Haviv
@@ -26,7 +26,7 @@ Requires-Dist: GitPython >=3.1.41,~=3.1
 Requires-Dist: aiohttp ~=3.9
 Requires-Dist: aiohttp-retry ~=2.8
 Requires-Dist: click ~=8.1
-Requires-Dist: kfp >=1.8.14,~=1.8
+Requires-Dist: kfp ~=1.8
 Requires-Dist: nest-asyncio ~=1.0
 Requires-Dist: ipython ~=8.10
 Requires-Dist: nuclio-jupyter ~=0.9.15
@@ -37,7 +37,7 @@ Requires-Dist: pyyaml ~=5.1
 Requires-Dist: requests ~=2.31
 Requires-Dist: tabulate ~=0.8.6
 Requires-Dist: v3io ~=0.6.4
-Requires-Dist: pydantic <1.10.15,>=1.10.8
+Requires-Dist: pydantic >=1.10.8,~=1.10
 Requires-Dist: mergedeep ~=1.3
 Requires-Dist: v3io-frames ~=0.10.12
 Requires-Dist: semver ~=3.0
@@ -82,14 +82,13 @@ Requires-Dist: uvicorn ~=0.27.1 ; extra == 'api'
 Requires-Dist: dask-kubernetes ~=0.11.0 ; extra == 'api'
 Requires-Dist: apscheduler <4,>=3.10.3 ; extra == 'api'
 Requires-Dist: objgraph ~=3.6 ; extra == 'api'
-Requires-Dist: igz-mgmt ==0.1.0 ; extra == 'api'
+Requires-Dist: igz-mgmt ~=0.1.0 ; extra == 'api'
 Requires-Dist: humanfriendly ~=10.0 ; extra == 'api'
 Requires-Dist: fastapi ~=0.110.0 ; extra == 'api'
 Requires-Dist: sqlalchemy ~=1.4 ; extra == 'api'
 Requires-Dist: pymysql ~=1.0 ; extra == 'api'
 Requires-Dist: alembic ~=1.9 ; extra == 'api'
 Requires-Dist: timelength ~=1.1 ; extra == 'api'
-Requires-Dist: memray ~=1.12 ; extra == 'api'
 Provides-Extra: azure-blob-storage
 Requires-Dist: msrest ~=0.6.21 ; extra == 'azure-blob-storage'
 Requires-Dist: azure-core ~=1.24 ; extra == 'azure-blob-storage'
@@ -142,9 +141,8 @@ Requires-Dist: gcsfs ==2023.9.2 ; extra == 'complete-api'
 Requires-Dist: google-cloud-bigquery[bqstorage,pandas] ==3.14.1 ; extra == 'complete-api'
 Requires-Dist: graphviz ~=0.20.0 ; extra == 'complete-api'
 Requires-Dist: humanfriendly ~=10.0 ; extra == 'complete-api'
-Requires-Dist: igz-mgmt ==0.1.0 ; extra == 'complete-api'
+Requires-Dist: igz-mgmt ~=0.1.0 ; extra == 'complete-api'
 Requires-Dist: kafka-python ~=2.0 ; extra == 'complete-api'
-Requires-Dist: memray ~=1.12 ; extra == 'complete-api'
 Requires-Dist: mlflow ~=2.8 ; extra == 'complete-api'
 Requires-Dist: msrest ~=0.6.21 ; extra == 'complete-api'
 Requires-Dist: objgraph ~=3.6 ; extra == 'complete-api'

{mlrun-1.6.3.dist-info → mlrun-1.6.3rc2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mlrun/__init__.py,sha256=o9dHUfVFADfsi6GnOPLr2OkfkHdPvOnA7rkoECen0-I,7248
 mlrun/__main__.py,sha256=zd-o0SkFH69HhIWKhqXnNURsrtpIcOJYYq50JfAxW7k,49234
-mlrun/config.py,sha256=4scerZD_BdeDIOXJw9xrXCmpSBHxEvuc7R9QZpAb5EA,63789
+mlrun/config.py,sha256=lhZTNnF3OQvoQuxN75hPPkRkWMCcEvu2hlHLaFBz7Zg,62795
 mlrun/errors.py,sha256=YdUtkN3qJ6yrseNygmKxmSWOfQ_RdKBhRxwwyMlTQCM,7106
 mlrun/execution.py,sha256=tgp6PcujZvGhDDVzPNs32YH_JNzaxfSd25yeuLwmjzg,40880
 mlrun/features.py,sha256=UQQ2uh5Xh9XsMGiYBqh3bKgDhOHANjv1gQgWyId9qQE,15624
 mlrun/k8s_utils.py,sha256=-6egUEZNPhzOxJ2gFytubvQvCYU9nPPg5Yn0zsTK-NQ,7065
 mlrun/kfpops.py,sha256=VgvS_4DappCPHzV7057SbraBTbF2mn7zZ7iPAaks3KU,30493
-mlrun/lists.py,sha256=sEEfl_mw_oVUD1dfkvQZIkJ8q7LJKJPDrb5B_Dg85nY,8388
-mlrun/model.py,sha256=EbSxpwtNFkqodTwM_StcmDG5MFSG50ZuDMhqzIyzLmM,64896
-mlrun/render.py,sha256=pfAky9fTHRbINs93_Km_hEdVxmra9RA8BwqMepPbiuE,13451
+mlrun/lists.py,sha256=JMc4Ch4wQxD_B9zbrE3JZwXD8cCYWLqHb1FQXWoaGzM,8310
+mlrun/model.py,sha256=Ggz9D8YCHCFluJQe1aPiddK1Mr34LYREirqJLa2i7IU,63956
+mlrun/render.py,sha256=_Jrtqw54AkvUZDWK5ORGUQWnGewREh_lQnUQWuCkTV4,13016
 mlrun/run.py,sha256=gyxYJqVCBsZxp0_HWAG5_lwi2_KPqcxy6un5ZLw_-2Q,42456
 mlrun/secrets.py,sha256=m7jM8fdjGLR-j9Vx-08eNmtOmlxFx9mTUBqBWtMSVQo,7782
 mlrun/api/schemas/__init__.py,sha256=ggWbnqhp7By5HNYYfRsZ4D4EdVvjLuz4qfNfR3Kq6M4,14219
@@ -72,6 +72,7 @@ mlrun/datastore/datastore_profile.py,sha256=vBpkAcnGiYUO09ihg_jPgPdpo2GVBrOOSHYW
 mlrun/datastore/dbfs_store.py,sha256=5IkxnFQXkW0fdx-ca5jjQnUdTsTfNdJzMvV31ZpDNrM,6634
 mlrun/datastore/filestore.py,sha256=cI_YvQqY5J3kEvdyPelfWofxKfBitoNHJvABBkpCGRc,3788
 mlrun/datastore/google_cloud_storage.py,sha256=zQlrZnYOFfwQNBw5J2ufoyCDMlbZKA9c9no7NvnylZ4,6038
+mlrun/datastore/helpers.py,sha256=-bKveE9rteLd0hJd6OSMuMbfz09W_OXyu1G5O2ihZjs,622
 mlrun/datastore/inmem.py,sha256=6PAltUk7uyYlDgnsaJPOkg_P98iku1ys2e2wpAmPRkc,2779
 mlrun/datastore/redis.py,sha256=DDA1FsixfnzNwjVUU9MgVCKFo3X3tYvPDcREKyy9zS4,5517
 mlrun/datastore/s3.py,sha256=BCyVDznEsmU1M1HtRROdLo4HkLOy4fjEmgpNrTpsoW0,8030
@@ -81,14 +82,13 @@ mlrun/datastore/spark_utils.py,sha256=54rF64aC19ojUFCcwzsoBLQ-5Nmzs_KTQl9iEkK2hY
 mlrun/datastore/store_resources.py,sha256=dfMdFy2urilECtlwLJr5CSG12MA645b-NPYDnbr5s1A,6839
 mlrun/datastore/targets.py,sha256=EaeNzwHQHkMo7WRezgMeWWjTL1NmYwMx8F0RG1swb48,70159
 mlrun/datastore/utils.py,sha256=x4pm0gvpcNWSjxo99MOmwcd9I5HCwuzCh6IA4uiXlZs,7077
-mlrun/datastore/v3io.py,sha256=3UI22DQ1A4yQEpbMWAbopIzjqlL2k5bhmhg0Cjs3tEk,8039
+mlrun/datastore/v3io.py,sha256=OyldGthdycuk7thQYHuCY-2XrGIef_14c2ReqgHh_7I,9188
 mlrun/datastore/wasbfs/__init__.py,sha256=s5Ul-0kAhYqFjKDR2X0O2vDGDbLQQduElb32Ev56Te4,1343
 mlrun/datastore/wasbfs/fs.py,sha256=MnSj7Q4OKA2L55ihCmUnj2t3GA3B77oLMdAw-yxvN9w,6151
 mlrun/db/__init__.py,sha256=WqJ4x8lqJ7ZoKbhEyFqkYADd9P6E3citckx9e9ZLcIU,1163
-mlrun/db/auth_utils.py,sha256=hpg8D2r82oN0BWabuWN04BTNZ7jYMAF242YSUpK7LFM,5211
 mlrun/db/base.py,sha256=Rg2TrcwvzN28vmoyhq8sSxNjiBS1EA6BAHr24fhcmNU,18221
 mlrun/db/factory.py,sha256=wTEKHEmdDkylM6IkTYvmEYVF8gn2HdjLoLoWICCyatI,2403
-mlrun/db/httpdb.py,sha256=FHrAwU7c4AQPCoXDIdkEkFfr8ViUS7XLJYIGrXrv_rs,157292
+mlrun/db/httpdb.py,sha256=gE01kWA7IwZqO9QTVCJ-YeGAnuwlEvxt-9q14pUfNfI,156147
 mlrun/db/nopdb.py,sha256=rpZy5cpW-8--4OvMzlVoKNYjbhWJ3cn_z-JFwfuPqnI,14520
 mlrun/feature_store/__init__.py,sha256=n1F5m1svFW2chbE2dJdWzZJJiYS4E-y8PQsG9Q-F0lU,1584
 mlrun/feature_store/api.py,sha256=ehEwKlmE07pq1FUwh-ehA8Jm9LTkQofl5MQpEiMwVqM,49520
@@ -202,11 +202,11 @@ mlrun/model_monitoring/batch.py,sha256=l0FTSTt9frLgqeSS9jY8IU_0OwlvSevuZBWBgnBGH
 mlrun/model_monitoring/controller.py,sha256=Zh7XnGevQyJCU8uMT8MC6kD7cP55vUJaIjqbBvSyuvA,27608
 mlrun/model_monitoring/controller_handler.py,sha256=kG3sTjhKdsd9QcHkUlYcvw08yPsVQs9FyFdcKP9iaCo,977
 mlrun/model_monitoring/evidently_application.py,sha256=o9PsDsjyRfcbuC1X1gb2ww5nzWCsR_KheabtpxKZ5yY,4824
-mlrun/model_monitoring/features_drift_table.py,sha256=OEDb_YZm3cyzszzC4SDqi7ufwOS8Kl5tDY1ZG4XIdZ4,24436
-mlrun/model_monitoring/helpers.py,sha256=l8RCxOGBoScZSL4M-x4fIfpsfH7wjSQpqA_t-HVk0BI,7087
+mlrun/model_monitoring/features_drift_table.py,sha256=2r51W4xQ8gNq3PXt73IfsYu4l4mjwD-dLfRVAvKplTE,24209
+mlrun/model_monitoring/helpers.py,sha256=25aTNY3jINyzE6KZfcLaWD7bHRyUDzRF1li3xD59i4Q,6955
 mlrun/model_monitoring/model_endpoint.py,sha256=BBtxdY5ciormI_al4zshmIp0GN7hGhOCn-hLgpCXek0,3938
 mlrun/model_monitoring/prometheus.py,sha256=Z0UWmhQ-dpGGH31gCiGdfmhfj-RFRf1Tu1bYVe-k4jk,7605
-mlrun/model_monitoring/stream_processing.py,sha256=mUmF12byO8h5CPszEqrI0xFbOWiyCYr493r58EElWyQ,49150
+mlrun/model_monitoring/stream_processing.py,sha256=BxdyIn65sv_IBDTAwoNOiNq8a6uks_pJUaY5z9-F4-Q,49203
 mlrun/model_monitoring/tracking_policy.py,sha256=Q6_p4y1ZcRHqs24c_1_4m9E1gYnaOm6pLCNGT22dWKM,5221
 mlrun/model_monitoring/writer.py,sha256=IWPzPenoAkfIxlvn0IdcdB19Nxqmg4mjbo3-RnYWw9A,8669
 mlrun/model_monitoring/stores/__init__.py,sha256=adU_G07jkD3JUT8__d0jAxs9nNomL7igKmd6uVM9L50,4525
@@ -239,8 +239,8 @@ mlrun/platforms/iguazio.py,sha256=eOO8CbeSD0ooUKp-hbXbRfzWo5OTP7QaBo6zh0BXTKc,19
 mlrun/platforms/other.py,sha256=z4pWqxXkVVuMLk-MbNb0Y_ZR5pmIsUm0R8vHnqpEnew,11852
 mlrun/projects/__init__.py,sha256=Lv5rfxyXJrw6WGOWJKhBz66M6t3_zsNMCfUD6waPwx4,1153
 mlrun/projects/operations.py,sha256=CJRGKEFhqKXlg0VOKhcfjOUVAmWHA9WwAFNiXtUqBhg,18550
-mlrun/projects/pipelines.py,sha256=FcKNsFtRUP1sOuSEp5Hk0_Qv4ZIKT9gWpatg6bSUCsI,41165
-mlrun/projects/project.py,sha256=U98H5DF0q17qZcQB4VqqPoEETFgh_VvV51DTHXQhsbA,153280
+mlrun/projects/pipelines.py,sha256=D4Ny3znuThM2IO6drxJBqlHY_Ipaiiqf2xwETXzp08E,40481
+mlrun/projects/project.py,sha256=ShoPjF2l3d_jp6nAWEfgxOwFUZoolMlr5RNSXGrOe1U,153100
 mlrun/runtimes/__init__.py,sha256=f5cdEg4raKNXQawJE-AuWzK6AqIsLfDODREeMnI2Ies,7062
 mlrun/runtimes/base.py,sha256=GTVqCR3sBqbyAlEBnDClThOf0EZUoAMzlEIFqjfoyLQ,36604
 mlrun/runtimes/constants.py,sha256=tB7nIlHob3yF0K9Uf9BUZ8yxjZNSzlzrd3K32K_vV7w,9550
@@ -252,7 +252,7 @@ mlrun/runtimes/generators.py,sha256=v28HdNgxdHvj888G1dTnUeQZz-D9iTO0hoGeZbCdiuQ,
 mlrun/runtimes/kubejob.py,sha256=UfSm7hiPLAtM0TfIE5nbBdSvrbsKWCZfvKP-SZhGyAk,12500
 mlrun/runtimes/local.py,sha256=depdJkbyas7V7SMXB1T6Y_jPXxTLEB1TL5HYzDxlcXI,21791
 mlrun/runtimes/nuclio.py,sha256=hwk4dUaZefI-Qbb4s289vQpt1h0nAucxf6eINzVI-d8,2908
-mlrun/runtimes/pod.py,sha256=loo1ysAbGslrHRhcRaFrw-ATNhuOBayEb0MCPi2EduY,56865
+mlrun/runtimes/pod.py,sha256=CBhKyNC20zCaRShS5UkgMR_61w_DpzEtEQ03T8J7u0k,56780
 mlrun/runtimes/remotesparkjob.py,sha256=W7WqlPbyqE6FjOZ2EFeOzlL1jLGWAWe61jOH0Umy3F4,7334
 mlrun/runtimes/serving.py,sha256=bV4Io-8K30IZs69pdZTSICR3HkUAAc1kSKuBJOx_jc0,30331
 mlrun/runtimes/utils.py,sha256=mNVu3ejmfEV3d7-fCAiSaF5K-Jyz2ladc5HzqhsY0Cs,16025
@@ -282,14 +282,14 @@ mlrun/track/tracker_manager.py,sha256=ZZzXtgQ-t4ah64XeAHNCbZ2VMOK_0E0RHv0pIowynj
 mlrun/track/trackers/__init__.py,sha256=9xft8YjJnblwqt8f05htmOt_eDzVBVQN07RfY_SYLCs,569
 mlrun/track/trackers/mlflow_tracker.py,sha256=zqqnECpxk_CHDKzEIdjwL9QUjXfueOw7xlZU7buguKY,23282
 mlrun/utils/__init__.py,sha256=g2pbT3loDw0GWELOC_rBq1NojSMCFnWrD-TYcDgAZiI,826
-mlrun/utils/async_http.py,sha256=J3z4dzU1zk96k1sLDiGUIciBu3pdgivqh-GExFv-Fn8,11773
+mlrun/utils/async_http.py,sha256=N-zkACdr2CZNwYyMaocSR6ZH90F_WV_ZRBVe9ssi-Ns,11141
 mlrun/utils/azure_vault.py,sha256=IbPAZh-7mp0j4PcCy1L079LuEA6ENrkWhKZvkD4lcTY,3455
 mlrun/utils/clones.py,sha256=QG2ka65-ysfrOaoziudEjJqGgAxJvFKZOXkiD9WZGN4,7386
 mlrun/utils/condition_evaluator.py,sha256=KFZC-apM7RU5TIlRszAzMFc0NqPj3W1rgP0Zv17Ud-A,1918
 mlrun/utils/db.py,sha256=fp9p2_z7XW3DhsceJEObWKh-e5zKjPiCM55kSGNkZD8,1658
 mlrun/utils/helpers.py,sha256=MRfvRQlxh9IITpYX68Sc8Lnej-SB5sWzIAy_7NhB44o,53692
 mlrun/utils/http.py,sha256=BLkPfCmXwFrpPrPXzipmDr9IhY3q5css7hovncXYs9g,8735
-mlrun/utils/logger.py,sha256=KZFzojroEshCu1kvtCsavJpdIY8vNA-QZxiBjehP9f4,7260
+mlrun/utils/logger.py,sha256=3SS-9ON0ScnUJp1S6P_jmaTRXuwF6MhBF5a5Ij8s3IU,7158
 mlrun/utils/regex.py,sha256=Nd7xnDHU9PEOsse6rFwLNVgU4AaYCyuwMmQ9qgx2-Vw,4581
 mlrun/utils/singleton.py,sha256=UUTQiBTXyzmjeYzsvTUsSxqyLJHOtesqif9GNfZO9rc,883
 mlrun/utils/v3io_clients.py,sha256=HL7Hma-pxaQBXMKcEnWqGLCpFgykwnszlabzeOHC9-E,1319
@@ -304,11 +304,11 @@ mlrun/utils/notifications/notification/ipython.py,sha256=qrBmtECiRG6sZpCIVMg7RZc
 mlrun/utils/notifications/notification/slack.py,sha256=5JysqIpUYUZKXPSeeZtbl7qb2L9dj7p2NvnEBcEsZkA,3898
 mlrun/utils/notifications/notification/webhook.py,sha256=QHezCuN5uXkLcroAGxGrhGHaxAdUvkDLIsp27_Yrfd4,2390
 mlrun/utils/version/__init__.py,sha256=7kkrB7hEZ3cLXoWj1kPoDwo4MaswsI2JVOBpbKgPAgc,614
-mlrun/utils/version/version.json,sha256=rk9MvAyByMv8Nmgcq1QMFOkTa8NP0K-g4bSlN47hPAo,84
+mlrun/utils/version/version.json,sha256=Q79aTfuKYcBACUpj4fKVBaUC3pT95vGtpP_TT5NG1Gs,88
 mlrun/utils/version/version.py,sha256=HMwseV8xjTQ__6T6yUWojx_z6yUj7Io7O4NcCCH_sz8,1970
-mlrun-1.6.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mlrun-1.6.3.dist-info/METADATA,sha256=ca26nwhJusTY2TzpDN36YP2Bb0OqX8t5B1Zj-RPQM2A,18400
-mlrun-1.6.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mlrun-1.6.3.dist-info/entry_points.txt,sha256=1Owd16eAclD5pfRCoJpYC2ZJSyGNTtUr0nCELMioMmU,46
-mlrun-1.6.3.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
-mlrun-1.6.3.dist-info/RECORD,,
+mlrun-1.6.3rc2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mlrun-1.6.3rc2.dist-info/METADATA,sha256=8GklrxH8xnHFI2ds8LGLvb-EZTWtxT_i52FtA-SlbCA,18291
+mlrun-1.6.3rc2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mlrun-1.6.3rc2.dist-info/entry_points.txt,sha256=1Owd16eAclD5pfRCoJpYC2ZJSyGNTtUr0nCELMioMmU,46
+mlrun-1.6.3rc2.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
+mlrun-1.6.3rc2.dist-info/RECORD,,

mlrun/db/auth_utils.py

@@ -1,152 +0,0 @@
-# Copyright 2024 Iguazio
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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 datetime import datetime, timedelta
-
-import requests
-
-import mlrun.errors
-from mlrun.utils import logger
-
-
-class TokenProvider(ABC):
-    @abstractmethod
-    def get_token(self):
-        pass
-
-    @abstractmethod
-    def is_iguazio_session(self):
-        pass
-
-
-class StaticTokenProvider(TokenProvider):
-    def __init__(self, token: str):
-        self.token = token
-
-    def get_token(self):
-        return self.token
-
-    def is_iguazio_session(self):
-        return mlrun.platforms.iguazio.is_iguazio_session(self.token)
-
-
-class OAuthClientIDTokenProvider(TokenProvider):
-    def __init__(
-        self, token_endpoint: str, client_id: str, client_secret: str, timeout=5
-    ):
-        if not token_endpoint or not client_id or not client_secret:
-            raise mlrun.errors.MLRunValueError(
-                "Invalid client_id configuration for authentication. Must provide token endpoint, client-id and secret"
-            )
-        self.token_endpoint = token_endpoint
-        self.client_id = client_id
-        self.client_secret = client_secret
-        self.timeout = timeout
-
-        # Since we're only issuing POST requests, which are actually a disguised GET, then it's ok to allow retries
-        # on them.
-        self._session = mlrun.utils.HTTPSessionWithRetry(
-            retry_on_post=True,
-            verbose=True,
-        )
-
-        self._cleanup()
-        self._refresh_token_if_needed()
-
-    def get_token(self):
-        self._refresh_token_if_needed()
-        return self.token
-
-    def is_iguazio_session(self):
-        return False
-
-    def _cleanup(self):
-        self.token = self.token_expiry_time = self.token_refresh_time = None
-
-    def _refresh_token_if_needed(self):
-        now = datetime.now()
-        if self.token:
-            if self.token_refresh_time and now <= self.token_refresh_time:
-                return self.token
-
-            # We only cleanup if token was really expired - even if we fail in refreshing the token, we can still
-            # use the existing one given that it's not expired.
-            if now >= self.token_expiry_time:
-                self._cleanup()
-
-        self._issue_token_request()
-        return self.token
-
-    def _issue_token_request(self, raise_on_error=False):
-        try:
-            headers = {"Content-Type": "application/x-www-form-urlencoded"}
-            request_body = {
-                "grant_type": "client_credentials",
-                "client_id": self.client_id,
-                "client_secret": self.client_secret,
-            }
-            response = self._session.request(
-                "POST",
-                self.token_endpoint,
-                timeout=self.timeout,
-                headers=headers,
-                data=request_body,
-            )
-        except requests.RequestException as exc:
-            error = f"Retrieving token failed: {mlrun.errors.err_to_str(exc)}"
-            if raise_on_error:
-                raise mlrun.errors.MLRunRuntimeError(error) from exc
-            else:
-                logger.warning(error)
-                return
-
-        if not response.ok:
-            error = "No error available"
-            if response.content:
-                try:
-                    data = response.json()
-                    error = data.get("error")
-                except Exception:
-                    pass
-            logger.warning(
-                "Retrieving token failed", status=response.status_code, error=error
-            )
-            if raise_on_error:
-                mlrun.errors.raise_for_status(response)
-            return
-
-        self._parse_response(response.json())
-
-    def _parse_response(self, data: dict):
-        # Response is described in https://datatracker.ietf.org/doc/html/rfc6749#section-4.4.3
-        # According to spec, there isn't a refresh token - just the access token and its expiry time (in seconds).
-        self.token = data.get("access_token")
-        expires_in = data.get("expires_in")
-        if not self.token or not expires_in:
-            token_str = "****" if self.token else "missing"
-            logger.warning(
-                "Failed to parse token response", token=token_str, expires_in=expires_in
-            )
-            return
-
-        now = datetime.now()
-        self.token_expiry_time = now + timedelta(seconds=expires_in)
-        self.token_refresh_time = now + timedelta(seconds=expires_in / 2)
-        logger.info(
-            "Successfully retrieved client-id token",
-            expires_in=expires_in,
-            expiry=str(self.token_expiry_time),
-            refresh=str(self.token_refresh_time),
-        )