mlrun 1.10.0rc6__py3-none-any.whl → 1.10.0rc7__py3-none-any.whl

mlrun/__main__.py

@@ -23,6 +23,7 @@ from ast import literal_eval
 from base64 import b64decode
 from os import environ, path, remove
 from pprint import pprint
+from typing import Optional
 
 import click
 import dotenv
@@ -199,6 +200,13 @@ def main():
     multiple=True,
     help="Logging configurations for the handler's returning values",
 )
+@click.option(
+    "--allow-cross-project",
+    is_flag=True,
+    default=True,  # TODO: remove this default in 1.11
+    help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
+    "as a baseline for a new project with a different name",
+)
 def run(
     url,
     param,
@@ -242,6 +250,7 @@ def run(
     run_args,
     ensure_project,
     returns,
+    allow_cross_project,
 ):
     """Execute a task and inject parameters."""
 
@@ -293,10 +302,11 @@ def run(
         mlrun.get_or_create_project(
             name=project,
             context="./",
+            allow_cross_project=allow_cross_project,
         )
     if func_url or kind:
         if func_url:
-            runtime = func_url_to_runtime(func_url, ensure_project)
+            runtime = func_url_to_runtime(func_url, ensure_project, allow_cross_project)
             kind = get_in(runtime, "kind", kind or "job")
             if runtime is None:
                 exit(1)
@@ -494,6 +504,13 @@ def run(
     default="/tmp/fullimage",
     help="path to file with full image data",
 )
+@click.option(
+    "--allow-cross-project",
+    is_flag=True,
+    default=True,  # TODO: remove this default in 1.11
+    help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
+    "as a baseline for a new project with a different name",
+)
 def build(
     func_url,
     name,
@@ -516,6 +533,7 @@ def build(
     state_file_path,
     image_file_path,
     full_image_file_path,
+    allow_cross_project,
 ):
     """Build a container image from code and requirements."""
 
@@ -591,6 +609,7 @@ def build(
         mlrun.get_or_create_project(
             name=project,
             context="./",
+            allow_cross_project=allow_cross_project,
         )
 
     if hasattr(func, "deploy"):
@@ -644,6 +663,13 @@ def build(
     is_flag=True,
     help="ensure the project exists, if not, create project",
 )
+@click.option(
+    "--allow-cross-project",
+    is_flag=True,
+    default=True,  # TODO: remove this default in 1.11
+    help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
+    "as a baseline for a new project with a different name",
+)
 def deploy(
     spec,
     source,
@@ -656,6 +682,7 @@ def deploy(
     verbose,
     env_file,
     ensure_project,
+    allow_cross_project,
 ):
     """Deploy model or function"""
     if env_file:
@@ -665,10 +692,11 @@ def deploy(
         mlrun.get_or_create_project(
             name=project,
             context="./",
+            allow_cross_project=allow_cross_project,
         )
 
     if func_url:
-        runtime = func_url_to_runtime(func_url, ensure_project)
+        runtime = func_url_to_runtime(func_url, ensure_project, allow_cross_project)
         if runtime is None:
             exit(1)
     elif spec:
@@ -971,6 +999,13 @@ def logs(uid, project, offset, db):
     "destination define: file=notification.json or a "
     'dictionary configuration e.g \'{"slack":{"webhook":"<webhook>"}}\'',
 )
+@click.option(
+    "--allow-cross-project",
+    is_flag=True,
+    default=True,  # TODO: remove this default in 1.11
+    help="Override the loaded project name. This flag ensures awareness of loading an existing project yaml "
+    "as a baseline for a new project with a different name",
+)
 def project(
     context,
     name,
@@ -998,6 +1033,7 @@ def project(
     notifications,
     save_secrets,
     save,
+    allow_cross_project,
 ):
     """load and/or run a project"""
     if env_file:
@@ -1024,6 +1060,7 @@ def project(
         clone=clone,
         save=save,
         parameters=parameters,
+        allow_cross_project=allow_cross_project,
     )
     url_str = " from " + url if url else ""
     print(f"Loading project {proj.name}{url_str} into {context}:\n")
@@ -1337,7 +1374,11 @@ def dict_to_str(struct: dict):
     return ",".join([f"{k}={v}" for k, v in struct.items()])
 
 
-def func_url_to_runtime(func_url, ensure_project: bool = False):
+def func_url_to_runtime(
+    func_url,
+    ensure_project: bool = False,
+    allow_cross_project: Optional[bool] = None,
+):
     try:
         if func_url.startswith("db://"):
             func_url = func_url[5:]
@@ -1348,7 +1389,9 @@ def func_url_to_runtime(func_url, ensure_project: bool = False):
             func_url = "function.yaml" if func_url == "." else func_url
             runtime = import_function_to_dict(func_url, {})
         else:
-            mlrun_project = load_project(".", save=ensure_project)
+            mlrun_project = load_project(
+                ".", save=ensure_project, allow_cross_project=allow_cross_project
+            )
             function = mlrun_project.get_function(func_url, enrich=True)
             if function.kind == "local":
                 command, function = load_func_code(function)

mlrun/artifacts/base.py

@@ -223,28 +223,9 @@ class Artifact(ModelObj):
         target_path=None,
         project=None,
         src_path: typing.Optional[str] = None,
-        # All params up until here are legacy params for compatibility with legacy artifacts.
-        # TODO: remove them in 1.10.0.
         metadata: ArtifactMetadata = None,
         spec: ArtifactSpec = None,
     ):
-        if (
-            key
-            or body
-            or viewer
-            or is_inline
-            or format
-            or size
-            or target_path
-            or project
-            or src_path
-        ):
-            warnings.warn(
-                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
-                "Use the metadata and spec parameters instead.",
-                DeprecationWarning,
-            )
-
         self._metadata = None
         self.metadata = metadata
         self._spec = None
@@ -769,17 +750,9 @@ class LinkArtifact(Artifact):
         link_key=None,
         link_tree=None,
         project=None,
-        # All params up until here are legacy params for compatibility with legacy artifacts.
-        # TODO: remove them in 1.10.0.
         metadata: ArtifactMetadata = None,
         spec: LinkArtifactSpec = None,
     ):
-        if key or target_path or link_iteration or link_key or link_tree or project:
-            warnings.warn(
-                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
-                "Use the metadata and spec parameters instead.",
-                DeprecationWarning,
-            )
         super().__init__(
             key, target_path=target_path, project=project, metadata=metadata, spec=spec
         )

mlrun/artifacts/dataset.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import os
 import pathlib
-import warnings
 from io import StringIO
 from typing import Optional
 
@@ -161,13 +160,6 @@ class DatasetArtifact(Artifact):
         label_column: Optional[str] = None,
         **kwargs,
     ):
-        if key or format or target_path:
-            warnings.warn(
-                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
-                "Use the metadata and spec parameters instead.",
-                DeprecationWarning,
-            )
-
         format = (format or "").lower()
         super().__init__(key, None, format=format, target_path=target_path)
         if format and format not in self.SUPPORTED_FORMATS:

mlrun/artifacts/model.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import tempfile
-import warnings
 from os import path
 from typing import Any, Optional, Union
 
@@ -189,12 +188,6 @@ class ModelArtifact(Artifact):
                                 Saved as a sub-dictionary under the parameter.
         :param kwargs:          Arguments to pass to the artifact class.
         """
-        if key or body or format or target_path:
-            warnings.warn(
-                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
-                "Use the metadata and spec parameters instead.",
-                DeprecationWarning,
-            )
         super().__init__(key, body, format=format, target_path=target_path, **kwargs)
         model_file = str(model_file or "")
         if model_file and model_url:

mlrun/artifacts/plots.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 import base64
 import typing
-import warnings
 from io import BytesIO
 
 import mlrun
@@ -35,12 +34,6 @@ class PlotArtifact(Artifact):
     def __init__(
         self, key=None, body=None, is_inline=False, target_path=None, title=None
     ):
-        if key or body or is_inline or target_path:
-            warnings.warn(
-                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
-                "Use the metadata and spec parameters instead.",
-                DeprecationWarning,
-            )
         super().__init__(key, body, format="html", target_path=target_path)
         self.metadata.description = title
 
@@ -94,12 +87,6 @@ class PlotlyArtifact(Artifact):
         :param key:         Key for the artifact to be stored in the database.
         :param target_path: Path to save the artifact.
         """
-        if key or target_path:
-            warnings.warn(
-                "Artifact constructor parameters are deprecated in 1.7.0 and will be removed in 1.10.0. "
-                "Use the metadata and spec parameters instead.",
-                DeprecationWarning,
-            )
         # Validate the plotly package:
         try:
             from plotly.graph_objs import Figure

mlrun/db/base.py

@@ -97,9 +97,6 @@ class RunDBInterface(ABC):
         uid: Optional[Union[str, list[str]]] = None,
         project: Optional[str] = None,
         labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-        state: Optional[
-            mlrun.common.runtimes.constants.RunStates
-        ] = None,  # Backward compatibility
         states: Optional[list[mlrun.common.runtimes.constants.RunStates]] = None,
         sort: bool = True,
         iter: bool = False,
@@ -442,23 +439,6 @@ class RunDBInterface(ABC):
     ) -> dict:
         pass
 
-    # TODO: remove in 1.10.0
-    @deprecated(
-        version="1.7.0",
-        reason="'list_features' will be removed in 1.10.0, use 'list_features_v2' instead",
-        category=FutureWarning,
-    )
-    @abstractmethod
-    def list_features(
-        self,
-        project: str,
-        name: Optional[str] = None,
-        tag: Optional[str] = None,
-        entities: Optional[list[str]] = None,
-        labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-    ) -> mlrun.common.schemas.FeaturesOutput:
-        pass
-
     @abstractmethod
     def list_features_v2(
         self,

mlrun/db/httpdb.py

@@ -901,9 +901,6 @@ class HTTPRunDB(RunDBInterface):
         uid: Optional[Union[str, list[str]]] = None,
         project: Optional[str] = None,
         labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-        state: Optional[
-            mlrun.common.runtimes.constants.RunStates
-        ] = None,  # Backward compatibility
         states: typing.Optional[list[mlrun.common.runtimes.constants.RunStates]] = None,
         sort: bool = True,
         iter: bool = False,
@@ -948,7 +945,6 @@ class HTTPRunDB(RunDBInterface):
             or just `"label"` for key existence.
             - A comma-separated string formatted as `"label1=value1,label2"` to match entities with
             the specified key-value pairs or key existence.
-        :param state: Deprecated - List only runs whose state is specified (will be removed in 1.10.0)
         :param states: List only runs whose state is one of the provided states.
         :param sort: Whether to sort the result according to their start time. Otherwise, results will be
             returned by their internal order in the DB (order will not be guaranteed).
@@ -976,7 +972,6 @@ class HTTPRunDB(RunDBInterface):
             uid=uid,
             project=project,
             labels=labels,
-            state=state,
             states=states,
             sort=sort,
             iter=iter,
@@ -2483,50 +2478,6 @@ class HTTPRunDB(RunDBInterface):
         resp = self.api_call("GET", path, error_message)
         return FeatureSet.from_dict(resp.json())
 
-    def list_features(
-        self,
-        project: Optional[str] = None,
-        name: Optional[str] = None,
-        tag: Optional[str] = None,
-        entities: Optional[list[str]] = None,
-        labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-    ) -> list[dict]:
-        """List feature-sets which contain specific features. This function may return multiple versions of the same
-        feature-set if a specific tag is not requested. Note that the various filters of this function actually
-        refer to the feature-set object containing the features, not to the features themselves.
-
-        :param project: Project which contains these features.
-        :param name: Name of the feature to look for. The name is used in a like query, and is not case-sensitive. For
-            example, looking for ``feat`` will return features which are named ``MyFeature`` as well as ``defeat``.
-        :param tag: Return feature-sets which contain the features looked for, and are tagged with the specific tag.
-        :param entities: Return only feature-sets which contain an entity whose name is contained in this list.
-        :param labels: Filter feature-sets by label key-value pairs or key existence. This can be provided as:
-            - A dictionary in the format `{"label": "value"}` to match specific label key-value pairs,
-            or `{"label": None}` to check for key existence.
-            - A list of strings formatted as `"label=value"` to match specific label key-value pairs,
-            or just `"label"` for key existence.
-            - A comma-separated string formatted as `"label1=value1,label2"` to match entities with
-            the specified key-value pairs or key existence.
-        :returns: A list of mapping from feature to a digest of the feature-set, which contains the feature-set
-            meta-data. Multiple entries may be returned for any specific feature due to multiple tags or versions
-            of the feature-set.
-        """
-
-        project = project or config.active_project
-        labels = self._parse_labels(labels)
-        params = {
-            "name": name,
-            "tag": tag,
-            "entity": entities or [],
-            "label": labels,
-        }
-
-        path = f"projects/{project}/features"
-
-        error_message = f"Failed listing features, project: {project}, query: {params}"
-        resp = self.api_call("GET", path, error_message, params=params)
-        return resp.json()["features"]
-
     def list_features_v2(
         self,
         project: Optional[str] = None,
@@ -5263,9 +5214,6 @@ class HTTPRunDB(RunDBInterface):
         uid: Optional[Union[str, list[str]]] = None,
         project: Optional[str] = None,
         labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-        state: Optional[
-            mlrun.common.runtimes.constants.RunStates
-        ] = None,  # Backward compatibility
         states: typing.Optional[list[mlrun.common.runtimes.constants.RunStates]] = None,
         sort: bool = True,
         iter: bool = False,
@@ -5299,20 +5247,12 @@ class HTTPRunDB(RunDBInterface):
                 "using the `with_notifications` flag."
             )
 
-        if state:
-            # TODO: Remove this in 1.10.0
-            warnings.warn(
-                "'state' is deprecated in 1.7.0 and will be removed in 1.10.0. Use 'states' instead.",
-                FutureWarning,
-            )
-
         labels = self._parse_labels(labels)
 
         if (
             not name
             and not uid
             and not labels
-            and not state
             and not states
             and not start_time_from
             and not start_time_to
@@ -5333,11 +5273,7 @@ class HTTPRunDB(RunDBInterface):
             "name": name,
             "uid": uid,
             "label": labels,
-            "state": (
-                mlrun.utils.helpers.as_list(state)
-                if state is not None
-                else states or None
-            ),
+            "states": states or None,
             "sort": bool2str(sort),
             "iter": bool2str(iter),
             "start_time_from": datetime_to_iso(start_time_from),

mlrun/db/nopdb.py

@@ -126,9 +126,6 @@ class NopDB(RunDBInterface):
         uid: Optional[Union[str, list[str]]] = None,
         project: Optional[str] = None,
         labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-        state: Optional[
-            mlrun.common.runtimes.constants.RunStates
-        ] = None,  # Backward compatibility
         states: Optional[list[mlrun.common.runtimes.constants.RunStates]] = None,
         sort: bool = True,
         iter: bool = False,
@@ -374,16 +371,6 @@ class NopDB(RunDBInterface):
     ) -> dict:
         pass
 
-    def list_features(
-        self,
-        project: str,
-        name: Optional[str] = None,
-        tag: Optional[str] = None,
-        entities: Optional[list[str]] = None,
-        labels: Optional[Union[str, dict[str, Optional[str]], list[str]]] = None,
-    ) -> mlrun.common.schemas.FeaturesOutput:
-        pass
-
     def list_features_v2(
         self,
         project: str,

mlrun/launcher/base.py

@@ -82,6 +82,7 @@ class BaseLauncher(abc.ABC):
         runtime: "mlrun.runtimes.base.BaseRuntime",
         project_name: Optional[str] = "",
         full: bool = True,
+        client_version: str = "",
     ):
         pass
 

mlrun/launcher/client.py

@@ -37,6 +37,7 @@ class ClientBaseLauncher(launcher.BaseLauncher, abc.ABC):
         runtime: "mlrun.runtimes.base.BaseRuntime",
         project_name: Optional[str] = "",
         full: bool = True,
+        client_version: str = "",
     ):
         runtime.try_auto_mount_based_on_config()
         runtime._fill_credentials()

mlrun/launcher/local.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 import os
 import pathlib
+from os import environ
 from typing import Callable, Optional, Union
 
 import mlrun.common.constants as mlrun_constants
@@ -251,6 +252,9 @@ class ClientLocalLauncher(launcher.ClientBaseLauncher):
             # copy the code/base-spec to the local function (for the UI and code logging)
             fn.spec.description = runtime.spec.description
             fn.spec.build = runtime.spec.build
+            serving_spec = getattr(runtime.spec, "serving_spec", None)
+            if serving_spec:
+                environ["SERVING_SPEC_ENV"] = serving_spec
 
         run.spec.handler = handler
         run.spec.reset_on_run = reset_on_run

mlrun/model_monitoring/applications/_application_steps.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import collections
-import json
 import traceback
 from collections import OrderedDict
 from datetime import datetime
@@ -23,10 +22,12 @@ import mlrun.common.schemas
 import mlrun.common.schemas.alert as alert_objects
 import mlrun.common.schemas.model_monitoring.constants as mm_constants
 import mlrun.model_monitoring.helpers
+import mlrun.platforms.iguazio
 from mlrun.serving import GraphContext
 from mlrun.serving.utils import StepToDict
 from mlrun.utils import logger
 
+from .base import _serialize_context_and_result
 from .context import MonitoringApplicationContext
 from .results import (
     ModelMonitoringApplicationMetric,
@@ -45,7 +46,7 @@ class _PushToMonitoringWriter(StepToDict):
         :param project: Project name.
         """
         self.project = project
-        self.output_stream = None
+        self._output_stream = None
 
     def do(
         self,
@@ -65,48 +66,31 @@ class _PushToMonitoringWriter(StepToDict):
 
         :param event: Monitoring result(s) to push and the original event from the controller.
         """
-        self._lazy_init()
         application_results, application_context = event
-        writer_event = {
-            mm_constants.WriterEvent.ENDPOINT_NAME: application_context.endpoint_name,
-            mm_constants.WriterEvent.APPLICATION_NAME: application_context.application_name,
-            mm_constants.WriterEvent.ENDPOINT_ID: application_context.endpoint_id,
-            mm_constants.WriterEvent.START_INFER_TIME: application_context.start_infer_time.isoformat(
-                sep=" ", timespec="microseconds"
-            ),
-            mm_constants.WriterEvent.END_INFER_TIME: application_context.end_infer_time.isoformat(
-                sep=" ", timespec="microseconds"
-            ),
-        }
-        for result in application_results:
-            data = result.to_dict()
-            if isinstance(result, ModelMonitoringApplicationResult):
-                writer_event[mm_constants.WriterEvent.EVENT_KIND] = (
-                    mm_constants.WriterEventKind.RESULT
-                )
-            elif isinstance(result, _ModelMonitoringApplicationStats):
-                writer_event[mm_constants.WriterEvent.EVENT_KIND] = (
-                    mm_constants.WriterEventKind.STATS
-                )
-            else:
-                writer_event[mm_constants.WriterEvent.EVENT_KIND] = (
-                    mm_constants.WriterEventKind.METRIC
-                )
-            writer_event[mm_constants.WriterEvent.DATA] = json.dumps(data)
-            logger.debug(
-                "Pushing data to output stream", writer_event=str(writer_event)
-            )
-            self.output_stream.push(
-                [writer_event], partition_key=application_context.endpoint_id
-            )
-            logger.debug("Pushed data to output stream successfully")
 
-    def _lazy_init(self):
-        if self.output_stream is None:
-            self.output_stream = mlrun.model_monitoring.helpers.get_output_stream(
+        writer_events = [
+            _serialize_context_and_result(context=application_context, result=result)
+            for result in application_results
+        ]
+
+        logger.debug("Pushing data to output stream", writer_events=str(writer_events))
+        self.output_stream.push(
+            writer_events, partition_key=application_context.endpoint_id
+        )
+        logger.debug("Pushed data to output stream successfully")
+
+    @property
+    def output_stream(
+        self,
+    ) -> Union[
+        mlrun.platforms.iguazio.OutputStream, mlrun.platforms.iguazio.KafkaOutputStream
+    ]:
+        if self._output_stream is None:
+            self._output_stream = mlrun.model_monitoring.helpers.get_output_stream(
                 project=self.project,
                 function_name=mm_constants.MonitoringFunctionNames.WRITER,
             )
+        return self._output_stream
 
 
 class _PrepareMonitoringEvent(StepToDict):