mlrun 1.10.0rc2__py3-none-any.whl → 1.10.0rc3__py3-none-any.whl

mlrun/feature_store/feature_vector.py

@@ -333,12 +333,14 @@ class FeatureVector(ModelObj):
     @property
     def uri(self):
         """fully qualified feature vector uri"""
-        uri = (
-            f"{self._metadata.project or mlconf.default_project}/{self._metadata.name}"
-        )
-        uri = get_store_uri(StorePrefix.FeatureVector, uri)
+        project = self._metadata.project or mlconf.active_project
+        name = self._metadata.name
+
+        base = name if not project else f"{project}/{name}"
+        uri = get_store_uri(StorePrefix.FeatureVector, base)
+
         if self._metadata.tag:
-            uri += ":" + self._metadata.tag
+            uri += f":{self._metadata.tag}"
         return uri
 
     def link_analysis(self, name, uri):
@@ -385,7 +387,7 @@ class FeatureVector(ModelObj):
     def save(self, tag="", versioned=False):
         """save to mlrun db"""
         db = mlrun.get_run_db()
-        self.metadata.project = self.metadata.project or mlconf.default_project
+        self.metadata.project = self.metadata.project or mlconf.active_project
         tag = tag or self.metadata.tag
         as_dict = self.to_dict()
         db.store_feature_vector(as_dict, tag=tag, versioned=versioned)

mlrun/launcher/base.py

@@ -273,7 +273,7 @@ class BaseLauncher(abc.ABC):
             project_name
             or run.metadata.project
             or runtime.metadata.project
-            or mlrun.mlconf.default_project
+            or mlrun.mlconf.active_project
         )
         run.spec.parameters = params or run.spec.parameters
         run.spec.inputs = inputs or run.spec.inputs

mlrun/lists.py

@@ -55,7 +55,7 @@ class RunList(list):
         for run in self:
             iterations = get_in(run, "status.iterations", "")
             row = [
-                get_in(run, "metadata.project", config.default_project),
+                get_in(run, "metadata.project", config.active_project),
                 get_in(run, "metadata.uid", ""),
                 get_in(run, "metadata.iteration", ""),
                 get_in(run, "status.start_time", ""),

mlrun/model_monitoring/__init__.py

@@ -16,4 +16,3 @@ from mlrun.common.schemas import ModelEndpoint, ModelEndpointList
 
 from .db import get_tsdb_connector
 from .helpers import get_stream_path
-from .tracking_policy import TrackingPolicy

mlrun/model_monitoring/api.py

@@ -14,7 +14,6 @@
 
 import hashlib
 import typing
-import warnings
 from datetime import datetime
 
 import numpy as np
@@ -136,12 +135,6 @@ def record_results(
     infer_results_df: typing.Optional[pd.DataFrame] = None,
     sample_set_statistics: typing.Optional[dict[str, typing.Any]] = None,
     monitoring_mode: mm_constants.ModelMonitoringMode = mm_constants.ModelMonitoringMode.enabled,
-    # Deprecated arguments:
-    drift_threshold: typing.Optional[float] = None,
-    possible_drift_threshold: typing.Optional[float] = None,
-    trigger_monitoring_job: bool = False,
-    artifacts_tag: str = "",
-    default_batch_image: str = "mlrun/mlrun",
 ) -> ModelEndpoint:
     """
     Write a provided inference dataset to model endpoint parquet target. If not exist, generate a new model endpoint
@@ -166,47 +159,10 @@ def record_results(
                                      the current model endpoint.
     :param monitoring_mode:          If enabled, apply model monitoring features on the provided endpoint id. Enabled
                                      by default.
-    :param drift_threshold:          (deprecated) The threshold of which to mark drifts.
-    :param possible_drift_threshold: (deprecated) The threshold of which to mark possible drifts.
-    :param trigger_monitoring_job:   (deprecated) If true, run the batch drift job. If not exists, the monitoring
-                                     batch function will be registered through MLRun API with the provided image.
-    :param artifacts_tag:            (deprecated) Tag to use for all the artifacts resulted from the function.
-                                     Will be relevant only if the monitoring batch job has been triggered.
-    :param default_batch_image:      (deprecated) The image that will be used when registering the model monitoring
-                                     batch job.
 
     :return: A ModelEndpoint object
     """
 
-    if drift_threshold is not None or possible_drift_threshold is not None:
-        warnings.warn(
-            "Custom drift threshold arguments are deprecated since version "
-            "1.7.0 and have no effect. They will be removed in version 1.9.0.\n"
-            "To enable the default histogram data drift application, run:\n"
-            "`project.enable_model_monitoring()`.",
-            FutureWarning,
-        )
-    if trigger_monitoring_job is not False:
-        warnings.warn(
-            "`trigger_monitoring_job` argument is deprecated since version "
-            "1.7.0 and has no effect. It will be removed in version 1.9.0.\n"
-            "To enable the default histogram data drift application, run:\n"
-            "`project.enable_model_monitoring()`.",
-            FutureWarning,
-        )
-    if artifacts_tag != "":
-        warnings.warn(
-            "`artifacts_tag` argument is deprecated since version "
-            "1.7.0 and has no effect. It will be removed in version 1.9.0.",
-            FutureWarning,
-        )
-    if default_batch_image != "mlrun/mlrun":
-        warnings.warn(
-            "`default_batch_image` argument is deprecated since version "
-            "1.7.0 and has no effect. It will be removed in version 1.9.0.",
-            FutureWarning,
-        )
-
     db = mlrun.get_run_db()
 
     model_endpoint = get_or_create_model_endpoint(

mlrun/model_monitoring/applications/evidently/base.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
-import posixpath
 import warnings
 from abc import ABC
 from tempfile import NamedTemporaryFile
@@ -60,7 +58,6 @@ except ModuleNotFoundError:
 
 if _HAS_EVIDENTLY:
     from evidently.core.report import Snapshot
-    from evidently.legacy.ui.storage.local.base import METADATA_PATH, FSLocation
     from evidently.ui.workspace import (
         STR_UUID,
         CloudWorkspace,
@@ -100,14 +97,13 @@ class EvidentlyModelMonitoringApplicationBase(
         self.evidently_project_id = evidently_project_id
         self.evidently_project = self.load_project()
 
-    def load_project(self) -> Project:
+    def load_project(self) -> "Project":
         """Load the Evidently project."""
         return self.evidently_workspace.get_project(self.evidently_project_id)
 
-    def get_workspace(self) -> WorkspaceBase:
+    def get_workspace(self) -> "WorkspaceBase":
         """Get the Evidently workspace. Override this method for customize access to the workspace."""
         if self.evidently_workspace_path:
-            self._log_location(self.evidently_workspace_path)
             return Workspace.create(self.evidently_workspace_path)
         else:
             raise MLRunValueError(
@@ -116,44 +112,10 @@ class EvidentlyModelMonitoringApplicationBase(
                 "`EVIDENTLY_API_KEY` environment variable. In other cases, override this method."
             )
 
-    def get_cloud_workspace(self) -> CloudWorkspace:
+    def get_cloud_workspace(self) -> "CloudWorkspace":
         """Load the Evidently cloud workspace according to the `EVIDENTLY_API_KEY` environment variable."""
         return CloudWorkspace()
 
-    @staticmethod
-    def _log_location(evidently_workspace_path):
-        # TODO remove function + usage after solving issue ML-9530
-        location = FSLocation(base_path=evidently_workspace_path)
-        location.invalidate_cache("")
-        paths = [p for p in location.listdir("") if location.isdir(p)]
-
-        for path in paths:
-            metadata_path = posixpath.join(path, METADATA_PATH)
-            full_path = posixpath.join(location.path, metadata_path)
-            print(f"evidently json issue, working on path: {full_path}")
-            try:
-                with location.open(metadata_path) as f:
-                    content = json.load(f)
-                    print(
-                        f"evidently json issue, successful load path: {full_path}, content: {content}"
-                    )
-            except FileNotFoundError:
-                print(f"evidently json issue, path not found: {full_path}")
-                continue
-            except json.decoder.JSONDecodeError as json_error:
-                print(
-                    f"evidently json issue, path got json error, path:{full_path}, error: {json_error}"
-                )
-                print("evidently json issue, file content:")
-                with location.open(metadata_path) as f:
-                    print(f.read())
-                continue
-            except Exception as error:
-                print(
-                    f"evidently json issue, path got general error, path:{full_path}, error: {error}"
-                )
-                continue
-
     @staticmethod
     def log_evidently_object(
         monitoring_context: mm_context.MonitoringApplicationContext,

mlrun/model_monitoring/controller.py

@@ -251,7 +251,7 @@ class MonitoringApplicationController:
 
     def __init__(self) -> None:
         """Initialize Monitoring Application Controller"""
-        self.project = cast(str, mlrun.mlconf.default_project)
+        self.project = cast(str, mlrun.mlconf.active_project)
         self.project_obj = mlrun.get_run_db().get_project(name=self.project)
         logger.debug(f"Initializing {self.__class__.__name__}", project=self.project)
 

mlrun/model_monitoring/writer.py

@@ -129,10 +129,7 @@ class ModelMonitoringWriter(StepToDict):
             )
         kind = event.pop(WriterEvent.EVENT_KIND, WriterEventKind.RESULT)
         result_event = _AppResultEvent(json.loads(event.pop(WriterEvent.DATA, "{}")))
-        if not result_event:  # BC for < 1.7.0, can be removed in 1.9.0
-            result_event = _AppResultEvent(event)
-        else:
-            result_event.update(_AppResultEvent(event))
+        result_event.update(_AppResultEvent(event))
 
         expected_keys = list(
             set(WriterEvent.list()).difference(

mlrun/projects/operations.py

@@ -309,9 +309,9 @@ def build_function(
     :param force_build: Force building the image, even when no changes were made
     """
     if not overwrite_build_params:
-        # TODO: change overwrite_build_params default to True in 1.9.0
+        # TODO: change overwrite_build_params default to True in 1.10.0
         warnings.warn(
-            "The `overwrite_build_params` parameter default will change from 'False' to 'True' in 1.9.0.",
+            "The `overwrite_build_params` parameter default will change from 'False' to 'True' in 1.10.0.",
             mlrun.utils.OverwriteBuildParamsWarning,
         )
 
@@ -340,7 +340,7 @@ def build_function(
             skip_deployed=skip_deployed,
         )
     else:
-        # TODO: remove filter once overwrite_build_params default is changed to True in 1.9.0
+        # TODO: remove filter once overwrite_build_params default is changed to True in 1.10.0
         with warnings.catch_warnings():
             warnings.simplefilter(
                 "ignore", category=mlrun.utils.OverwriteBuildParamsWarning

mlrun/projects/project.py

@@ -278,7 +278,7 @@ def new_project(
         for key, val in parameters.items():
             project.spec.params[key] = val
 
-    _set_as_current_default_project(project)
+    _set_as_current_active_project(project)
 
     if save and mlrun.mlconf.dbpath:
         if overwrite:
@@ -451,7 +451,7 @@ def load_project(
     if sync_functions:
         project.sync_functions(save=to_save)
 
-    _set_as_current_default_project(project)
+    _set_as_current_active_project(project)
 
     return project
 
@@ -471,7 +471,7 @@ def get_or_create_project(
     allow_cross_project: Optional[bool] = None,
 ) -> "MlrunProject":
     """Load a project from MLRun DB, or create/import if it does not exist.
-    The project will become the default project for the current session.
+    The project will become the active project for the current session.
 
     MLRun looks for a project.yaml file with project definition and objects in the project root path
     and use it to initialize the project, in addition it runs the project_setup.py file (if it exists)
@@ -757,10 +757,10 @@ def _project_instance_from_struct(struct, name, allow_cross_project):
         )
 
         if allow_cross_project is None:
-            # TODO: Remove this warning in version 1.9.0 and also fix cli to support allow_cross_project
+            # TODO: Remove this warning in version 1.10.0 and also fix cli to support allow_cross_project
             warnings.warn(
                 f"Project {name=} is different than specified on the context's project yaml. "
-                "This behavior is deprecated and will not be supported from version 1.9.0."
+                "This behavior is deprecated and will not be supported from version 1.10.0."
             )
             logger.warn(error_message)
         elif allow_cross_project:
@@ -2479,9 +2479,9 @@ class MlrunProject(ModelObj):
         :param fetch_credentials_from_sys_config: If true, fetch the credentials from the system configuration.
         """
         if default_controller_image != "mlrun/mlrun":
-            # TODO: Remove this in 1.9.0
+            # TODO: Remove this in 1.10.0
             warnings.warn(
-                "'default_controller_image' is deprecated and will be removed in 1.9.0, "
+                "'default_controller_image' is deprecated in 1.7.0 and will be removed in 1.10.0, "
                 "use 'image' instead",
                 FutureWarning,
             )
@@ -2892,9 +2892,9 @@ class MlrunProject(ModelObj):
 
         :param name: name of the model-monitoring-function/s (under the project)
         """
-        # TODO: Remove this in 1.9.0
+        # TODO: Remove this in 1.10.0
         warnings.warn(
-            "'remove_model_monitoring_function' is deprecated and will be removed in 1.9.0. "
+            "'remove_model_monitoring_function' is deprecated in 1.7.0 and will be removed in 1.10.0. "
             "Please use `delete_model_monitoring_function` instead.",
             FutureWarning,
         )
@@ -4107,9 +4107,9 @@ class MlrunProject(ModelObj):
             (by default `/home/mlrun_code`)
         """
         if not overwrite_build_params:
-            # TODO: change overwrite_build_params default to True in 1.9.0
+            # TODO: change overwrite_build_params default to True in 1.10.0
             warnings.warn(
-                "The `overwrite_build_params` parameter default will change from 'False' to 'True' in 1.9.0.",
+                "The `overwrite_build_params` parameter default will change from 'False' to 'True' in 1.10.0.",
                 mlrun.utils.OverwriteBuildParamsWarning,
             )
         default_image_name = mlrun.mlconf.default_project_image_name.format(
@@ -4186,9 +4186,9 @@ class MlrunProject(ModelObj):
             )
 
         if not overwrite_build_params:
-            # TODO: change overwrite_build_params default to True in 1.9.0
+            # TODO: change overwrite_build_params default to True in 1.10.0
             warnings.warn(
-                "The `overwrite_build_params` parameter default will change from 'False' to 'True' in 1.9.0.",
+                "The `overwrite_build_params` parameter default will change from 'False' to 'True' in 1.10.0.",
                 mlrun.utils.OverwriteBuildParamsWarning,
             )
 
@@ -4516,7 +4516,7 @@ class MlrunProject(ModelObj):
             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 tree: Return artifacts of the requested tree.
-        :param limit: Maximum number of artifacts to return.
+        :param limit: Deprecated - Maximum number of artifacts to return (will be removed in 1.11.0).
         :param format_: The format in which to return the artifacts. Default is 'full'.
         """
         db = mlrun.db.get_run_db(secrets=self._secrets)
@@ -4789,7 +4789,7 @@ class MlrunProject(ModelObj):
         :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).
-        :param last: Deprecated - currently not used (will be removed in 1.9.0).
+        :param last: Deprecated - currently not used (will be removed in 1.10.0).
         :param iter: If ``True`` return runs from all iterations. Otherwise, return only runs whose ``iter`` is 0.
         :param start_time_from: Filter by run start time in ``[start_time_from, start_time_to]``.
         :param start_time_to: Filter by run start time in ``[start_time_from, start_time_to]``.
@@ -4800,9 +4800,9 @@ class MlrunProject(ModelObj):
         :param end_time_to: Filter by run end time in ``[end_time_from, end_time_to]``.
         """
         if state:
-            # TODO: Remove this in 1.9.0
+            # TODO: Remove this in 1.10.0
             warnings.warn(
-                "'state' is deprecated and will be removed in 1.9.0. Use 'states' instead.",
+                "'state' is deprecated in 1.7.0 and will be removed in 1.10.0. Use 'states' instead.",
                 FutureWarning,
             )
 
@@ -5460,8 +5460,8 @@ class MlrunProject(ModelObj):
         return os.getenv("V3IO_USERNAME") or self.spec.owner
 
 
-def _set_as_current_default_project(project: MlrunProject):
-    mlrun.mlconf.default_project = project.metadata.name
+def _set_as_current_active_project(project: MlrunProject):
+    mlrun.mlconf.active_project = project.metadata.name
     pipeline_context.set(project)
 
 

mlrun/run.py

@@ -223,7 +223,7 @@ def get_or_create_ctx(
     :param spec:     dictionary holding run spec
     :param with_env: look for context in environment vars, default True
     :param rundb:    path/url to the metadata and artifact database
-    :param project:  project to initiate the context in (by default `mlrun.mlconf.default_project`)
+    :param project:  project to initiate the context in (by default `mlrun.mlconf.active_project`)
     :param upload_artifacts:  when using local context (not as part of a job/run), upload artifacts to the
                               system default artifact path location
     :param labels: (deprecated - use spec instead) dict of the context labels.
@@ -261,7 +261,7 @@ def get_or_create_ctx(
     """
     if labels:
         warnings.warn(
-            "The `labels` argument is deprecated and will be removed in 1.9.0. "
+            "The `labels` argument is deprecated in 1.7.0 and will be removed in 1.10.0. "
             "Please use `spec` instead, e.g.:\n"
             "spec={'metadata': {'labels': {'key': 'value'}}}",
             FutureWarning,
@@ -298,7 +298,7 @@ def get_or_create_ctx(
         newspec = {}
         if upload_artifacts:
             artifact_path = mlrun.utils.helpers.template_artifact_path(
-                mlconf.artifact_path, project or mlconf.default_project
+                mlconf.artifact_path, project or mlconf.active_project
             )
             update_in(newspec, ["spec", RunKeys.output_path], artifact_path)
 
@@ -312,7 +312,7 @@ def get_or_create_ctx(
         logger.info(f"Logging run results to: {out}")
 
     newspec["metadata"]["project"] = (
-        newspec["metadata"].get("project") or project or mlconf.default_project
+        newspec["metadata"].get("project") or project or mlconf.active_project
     )
 
     newspec["metadata"].setdefault("labels", {})
@@ -369,9 +369,9 @@ def import_function(url="", secrets=None, db="", project=None, new_name=None):
         url, is_hub_uri = extend_hub_uri_if_needed(url)
         runtime = import_function_to_dict(url, secrets)
     function = new_function(runtime=runtime)
-    project = project or mlrun.mlconf.default_project
+    project = project or mlrun.mlconf.active_project
     # When we're importing from the hub we want to assign to a target project, otherwise any store on it will
-    # simply default to the default project
+    # simply default to the active project
     if project and is_hub_uri:
         function.metadata.project = project
     if new_name:
@@ -464,7 +464,7 @@ def new_function(
            f = new_function().run(task, handler=myfunction)
 
     :param name:     function name
-    :param project:  function project (none for 'default')
+    :param project:  function project (none for the active project)
     :param tag:      function version tag (none for 'latest')
 
     :param kind:     runtime type (local, job, nuclio, spark, mpijob, dask, ..)
@@ -523,7 +523,7 @@ def new_function(
 
     runner.metadata.name = name
     runner.metadata.project = (
-        runner.metadata.project or project or mlconf.default_project
+        runner.metadata.project or project or mlconf.active_project
     )
     if tag:
         runner.metadata.tag = tag
@@ -640,7 +640,7 @@ def code_to_function(
     Learn more about :doc:`../../concepts/functions-overview`
 
     :param name:         function name, typically best to use hyphen-case
-    :param project:      project used to namespace the function, defaults to 'default'
+    :param project:      project used to namespace the function, defaults to the active project
     :param tag:          function tag to track multiple versions of the same function, defaults to 'latest'
     :param filename:     path to .py/.ipynb file, defaults to current jupyter notebook
     :param handler:      The default function handler to call for the job or nuclio function, in batch functions
@@ -729,7 +729,7 @@ def code_to_function(
                 fn.spec.volume_mounts.append(vol.get("volumeMount"))
 
         fn.spec.description = description
-        fn.metadata.project = project or mlconf.default_project
+        fn.metadata.project = project or mlconf.active_project
         fn.metadata.tag = tag
         fn.metadata.categories = categories
         fn.metadata.labels = labels or fn.metadata.labels

mlrun/runtimes/base.py

@@ -148,10 +148,10 @@ class FunctionSpec(ModelObj):
 
     @property
     def clone_target_dir(self):
-        # TODO: remove this property in 1.9.0
+        # TODO: remove this property in 1.10.0
         if self.build.source_code_target_dir:
             warnings.warn(
-                "The clone_target_dir attribute is deprecated in 1.6.2 and will be removed in 1.9.0. "
+                "The clone_target_dir attribute is deprecated in 1.6.2 and will be removed in 1.10.0. "
                 "Use spec.build.source_code_target_dir instead.",
                 FutureWarning,
             )
@@ -159,10 +159,10 @@ class FunctionSpec(ModelObj):
 
     @clone_target_dir.setter
     def clone_target_dir(self, clone_target_dir):
-        # TODO: remove this property in 1.9.0
+        # TODO: remove this property in 1.10.0
         if clone_target_dir:
             warnings.warn(
-                "The clone_target_dir attribute is deprecated in 1.6.2 and will be removed in 1.9.0. "
+                "The clone_target_dir attribute is deprecated in 1.6.2 and will be removed in 1.10.0. "
                 "Use spec.build.source_code_target_dir instead.",
                 FutureWarning,
             )
@@ -470,14 +470,14 @@ class BaseRuntime(ModelObj):
         :return: Dictionary with all the variables that could be parsed
         """
         runtime_env = {
-            "MLRUN_DEFAULT_PROJECT": self.metadata.project or config.default_project
+            "MLRUN_ACTIVE_PROJECT": self.metadata.project or config.active_project
         }
         if runobj:
             runtime_env["MLRUN_EXEC_CONFIG"] = runobj.to_json(
                 exclude_notifications_params=True
             )
             if runobj.metadata.project:
-                runtime_env["MLRUN_DEFAULT_PROJECT"] = runobj.metadata.project
+                runtime_env["MLRUN_ACTIVE_PROJECT"] = runobj.metadata.project
             if runobj.spec.verbose:
                 runtime_env["MLRUN_LOG_LEVEL"] = "DEBUG"
         if config.httpdb.api_url:

mlrun/runtimes/kubejob.py

@@ -114,9 +114,9 @@ class KubejobRuntime(KubeResource):
             e.g. builder_env={"GIT_TOKEN": token}
         """
         if not overwrite:
-            # TODO: change overwrite default to True in 1.9.0
+            # TODO: change overwrite default to True in 1.10.0
             warnings.warn(
-                "The `overwrite` parameter default will change from 'False' to 'True' in 1.9.0.",
+                "The `overwrite` parameter default will change from 'False' to 'True' in 1.10.0.",
                 mlrun.utils.OverwriteBuildParamsWarning,
             )
         image = mlrun.utils.helpers.remove_image_protocol_prefix(image)

mlrun/runtimes/nuclio/function.py

@@ -623,9 +623,9 @@ class RemoteRuntime(KubeResource):
         :param force_build: set True for force building the image
         """
         if auth_info:
-            # TODO: remove in 1.9.0
+            # TODO: remove in 1.10.0
             warnings.warn(
-                "'auth_info' is deprecated for nuclio runtimes in 1.7.0 and will be removed in 1.9.0",
+                "'auth_info' is deprecated for nuclio runtimes in 1.7.0 and will be removed in 1.10.0",
                 FutureWarning,
             )
 
@@ -833,7 +833,7 @@ class RemoteRuntime(KubeResource):
     def _get_runtime_env(self):
         # for runtime specific env var enrichment (before deploy)
         runtime_env = {
-            "MLRUN_DEFAULT_PROJECT": self.metadata.project or mlconf.default_project,
+            "MLRUN_ACTIVE_PROJECT": self.metadata.project or mlconf.active_project,
         }
         if mlconf.httpdb.api_url:
             runtime_env["MLRUN_DBPATH"] = mlconf.httpdb.api_url

mlrun/runtimes/nuclio/serving.py

@@ -11,12 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import copy
 import json
 import os
 import warnings
 from copy import deepcopy
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 import nuclio
 from nuclio import KafkaTrigger
@@ -27,7 +27,11 @@ from mlrun.datastore import get_kafka_brokers_from_dict, parse_kafka_url
 from mlrun.model import ObjectList
 from mlrun.runtimes.function_reference import FunctionReference
 from mlrun.secrets import SecretsStore
-from mlrun.serving.server import GraphServer, create_graph_server
+from mlrun.serving.server import (
+    GraphServer,
+    add_system_steps_to_graph,
+    create_graph_server,
+)
 from mlrun.serving.states import (
     RootFlowStep,
     RouterStep,
@@ -43,10 +47,6 @@ from .function import NuclioSpec, RemoteRuntime, min_nuclio_versions
 
 serving_subkind = "serving_v2"
 
-if TYPE_CHECKING:
-    # remove this block in 1.9.0
-    from mlrun.model_monitoring import TrackingPolicy
-
 
 def new_v2_model_server(
     name,
@@ -95,7 +95,6 @@ class ServingSpec(NuclioSpec):
         "default_class",
         "secret_sources",
         "track_models",
-        "tracking_policy",
     ]
 
     def __init__(
@@ -132,7 +131,6 @@ class ServingSpec(NuclioSpec):
         graph_initializer=None,
         error_stream=None,
         track_models=None,
-        tracking_policy=None,
         secret_sources=None,
         default_content_type=None,
         node_name=None,
@@ -207,7 +205,6 @@ class ServingSpec(NuclioSpec):
         self.graph_initializer = graph_initializer
         self.error_stream = error_stream
         self.track_models = track_models
-        self.tracking_policy = tracking_policy
         self.secret_sources = secret_sources or []
         self.default_content_type = default_content_type
         self.model_endpoint_creation_task_name = model_endpoint_creation_task_name
@@ -314,7 +311,6 @@ class ServingRuntime(RemoteRuntime):
         batch: Optional[int] = None,
         sampling_percentage: float = 100,
         stream_args: Optional[dict] = None,
-        tracking_policy: Optional[Union["TrackingPolicy", dict]] = None,
         enable_tracking: bool = True,
     ) -> None:
         """Apply on your serving function to monitor a deployed model, including real-time dashboards to detect drift
@@ -361,20 +357,12 @@ class ServingRuntime(RemoteRuntime):
         if batch:
             warnings.warn(
                 "The `batch` size parameter was deprecated in version 1.8.0 and is no longer used. "
-                "It will be removed in 1.10.",
-                # TODO: Remove this in 1.10
+                "It will be removed in 1.11.",
+                # TODO: Remove this in 1.11
                 FutureWarning,
             )
         if stream_args:
             self.spec.parameters["stream_args"] = stream_args
-        if tracking_policy is not None:
-            warnings.warn(
-                "The `tracking_policy` argument is deprecated from version 1.7.0 "
-                "and has no effect. It will be removed in 1.9.0.\n"
-                "To set the desired model monitoring time window and schedule, use "
-                "the `base_period` argument in `project.enable_model_monitoring()`.",
-                FutureWarning,
-            )
 
     def add_model(
         self,
@@ -719,7 +707,6 @@ class ServingRuntime(RemoteRuntime):
             "graph_initializer": self.spec.graph_initializer,
             "error_stream": self.spec.error_stream,
             "track_models": self.spec.track_models,
-            "tracking_policy": None,
             "default_content_type": self.spec.default_content_type,
             "model_endpoint_creation_task_name": self.spec.model_endpoint_creation_task_name,
         }
@@ -761,10 +748,13 @@ class ServingRuntime(RemoteRuntime):
             set_paths(workdir)
             os.chdir(workdir)
 
+        system_graph = None
+        if isinstance(self.spec.graph, RootFlowStep):
+            system_graph = add_system_steps_to_graph(copy.deepcopy(self.spec.graph))
         server = create_graph_server(
             parameters=self.spec.parameters,
             load_mode=self.spec.load_mode,
-            graph=self.spec.graph,
+            graph=system_graph or self.spec.graph,
             verbose=self.verbose,
             current_function=current_function,
             graph_initializer=self.spec.graph_initializer,