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

mlrun/config.py

@@ -1376,14 +1376,14 @@ 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__
+        desired_formatter_name = log_formatter.__class__.__name__
         if current_formatter_name != desired_formatter_name:
-            current_handler.setFormatter(log_formatter())
+            current_handler.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/db/httpdb.py

@@ -137,6 +137,8 @@ class HTTPRunDB(RunDBInterface):
         self.base_url = base_url
         username = parsed_url.username or config.httpdb.user
         password = parsed_url.password or config.httpdb.password
+        self.user = username
+        self.password = password
         self.token_provider = None
 
         if config.auth_with_client_id.enabled:
@@ -154,9 +156,6 @@ class HTTPRunDB(RunDBInterface):
             if token:
                 self.token_provider = StaticTokenProvider(token)
 
-        self.user = username
-        self.password = password
-
     def __repr__(self):
         cls = self.__class__.__name__
         return f"{cls}({self.base_url!r})"
@@ -944,7 +943,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 +969,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 +990,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

@@ -1058,7 +1058,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,8 +1072,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]:
         """
@@ -1387,10 +1384,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/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/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": "dbb53dc1e528cfa04c02960e9de29fcad530c9ed",
+  "version": "1.6.3-rc4"
 }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mlrun
-Version: 1.6.3
+Version: 1.6.3rc4
 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
@@ -89,7 +89,6 @@ 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'
@@ -144,7 +143,6 @@ 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: 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.3rc4.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=U8La3z_0ac5d71qq6qydUsxLYiBPfEZOf-i-8SdKA7c,63797
 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=Ax3h8A0-vUp8hRDNgttQuLoxaB0_8X8-yjpTLbBhirQ,64579
+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
@@ -88,7 +88,7 @@ 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=SdbGVA1R3acUXATlkisEIV9zK4RW4MORmKyU3wuJdWI,156881
 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
@@ -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=Jd9xQviLgtl-g6Ug6Kgcw_smZAZFd6k_4rtbV5pGoVg,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.3rc4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mlrun-1.6.3rc4.dist-info/METADATA,sha256=OFf0HHI4PeJOXNCEluzTbK020vLthQrTFxOky9sDVvc,18293
+mlrun-1.6.3rc4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mlrun-1.6.3rc4.dist-info/entry_points.txt,sha256=1Owd16eAclD5pfRCoJpYC2ZJSyGNTtUr0nCELMioMmU,46
+mlrun-1.6.3rc4.dist-info/top_level.txt,sha256=NObLzw3maSF9wVrgSeYBv-fgnHkAJ1kEkh12DLdd5KM,6
+mlrun-1.6.3rc4.dist-info/RECORD,,