mlrun 1.4.0rc25__py3-none-any.whl → 1.5.0rc2__py3-none-any.whl

mlrun/__init__.py

@@ -36,14 +36,7 @@ from .errors import MLRunInvalidArgumentError, MLRunNotFoundError
 from .execution import MLClientCtx
 from .model import RunObject, RunTemplate, new_task
 from .package import ArtifactType, DefaultPackager, Packager, handler
-from .platforms import (
-    VolumeMount,
-    auto_mount,
-    mount_v3io,
-    mount_v3io_extended,
-    mount_v3io_legacy,
-    v3io_cred,
-)
+from .platforms import VolumeMount, auto_mount, mount_v3io, v3io_cred
 from .projects import (
     ProjectMetadata,
     build_function,
@@ -66,7 +59,6 @@ from .run import (
     import_function,
     new_function,
     run_local,
-    run_pipeline,
     wait_for_pipeline_completion,
 )
 from .runtimes import new_model_server
@@ -91,9 +83,7 @@ if "IGZ_NAMESPACE_DOMAIN" in environ:
 def set_environment(
     api_path: str = None,
     artifact_path: str = "",
-    project: str = "",
     access_key: str = None,
-    user_project=False,
     username: str = None,
     env_file: str = None,
     mock_functions: str = None,
@@ -109,18 +99,14 @@ def set_environment(
     example::
 
         from os import path
-        project_name, artifact_path = set_environment(project='my-project')
+        project_name, artifact_path = set_environment()
         set_environment("http://localhost:8080", artifact_path="./")
         set_environment(env_file="mlrun.env")
         set_environment("<remote-service-url>", access_key="xyz", username="joe")
 
     :param api_path:       location/url of mlrun api service
     :param artifact_path:  path/url for storing experiment artifacts
-    :param project:        default project name (deprecated in 1.3.0 and will be removed in 1.5.0) - use project
-                           APIs such as `get_or_create_project`, `load_project` to configure the active project
     :param access_key:     set the remote cluster access key (V3IO_ACCESS_KEY)
-    :param user_project:   add the current user name to the provided project name (making it unique per user)
-                           (deprecated in 1.3.0 and will be removed in 1.5.0)
     :param username:       name of the user to authenticate
     :param env_file:       path/url to .env file (holding MLRun config and other env vars), see: set_env_from_file()
     :param mock_functions: set to True to create local/mock functions instead of real containers,
@@ -129,14 +115,6 @@ def set_environment(
         default project name
         actual artifact path/url, can be used to create subpaths per task or group of artifacts
     """
-    if user_project or project:
-        warnings.warn(
-            "'user_project' and 'project' are deprecated in 1.3.0, and will be removed in 1.5.0, use project "
-            "APIs such as 'get_or_create_project', 'load_project' to configure the active project.",
-            # TODO: Remove in 1.5.0
-            FutureWarning,
-        )
-
     if env_file:
         set_env_from_file(env_file)
 
@@ -160,17 +138,6 @@ def set_environment(
     if api_path:
         environ["MLRUN_DBPATH"] = mlconf.dbpath
 
-    project = _add_username_to_project_name_if_needed(project, user_project)
-    if project:
-        ProjectMetadata.validate_project_name(project)
-
-    mlconf.default_project = project or mlconf.default_project
-    # We want to ensure the project exists, and verify we're authorized to work on it
-    # if it doesn't exist this will create it (and obviously if we created it, we're authorized to work on it)
-    # if it does exist - this will get it, which will fail if we're not authorized to work on it
-    if project:
-        get_or_create_project(mlconf.default_project, "./")
-
     if not mlconf.artifact_path and not artifact_path:
         raise ValueError(
             "default artifact_path was not configured, please specify a valid artifact_path"

mlrun/__main__.py

@@ -17,7 +17,6 @@ import json
 import pathlib
 import socket
 import traceback
-import warnings
 from ast import literal_eval
 from base64 import b64decode, b64encode
 from os import environ, path, remove
@@ -33,6 +32,7 @@ import yaml
 from tabulate import tabulate
 
 import mlrun
+from mlrun.common.helpers import parse_versioned_object_uri
 
 from .config import config as mlconf
 from .db import get_run_db
@@ -55,7 +55,6 @@ from .utils import (
     is_relative_path,
     list2dict,
     logger,
-    parse_versioned_object_uri,
     run_keys,
     update_in,
 )
@@ -592,12 +591,6 @@ def build(
     default="",
     help="path/url of function yaml or function " "yaml or db://<project>/<name>[:tag]",
 )
-@click.option(
-    "--dashboard",
-    "-d",
-    default="",
-    help="Deprecated. Keep empty to allow auto-detect by MLRun API",
-)
 @click.option("--project", "-p", default="", help="project name")
 @click.option("--model", "-m", multiple=True, help="model name and path (name=path)")
 @click.option("--kind", "-k", default=None, help="runtime sub kind")
@@ -616,7 +609,6 @@ def deploy(
     spec,
     source,
     func_url,
-    dashboard,
     project,
     model,
     tag,
@@ -677,16 +669,8 @@ def deploy(
             function.set_env(k, v)
     function.verbose = verbose
 
-    if dashboard:
-        warnings.warn(
-            "'--dashboard' is deprecated in 1.3.0, and will be removed in 1.5.0, "
-            "Keep '--dashboard' value empty to allow auto-detection by MLRun API.",
-            # TODO: Remove in 1.5.0
-            FutureWarning,
-        )
-
     try:
-        addr = function.deploy(dashboard=dashboard, project=project, tag=tag)
+        addr = function.deploy(project=project, tag=tag)
     except Exception as err:
         print(f"deploy error: {err_to_str(err)}")
         exit(1)
@@ -767,6 +751,7 @@ def get(kind, name, selector, namespace, uid, project, tag, db, extra_args):
         ]
         df["tree"] = df["tree"].apply(lambda x: f"..{x[-8:]}")
         df["hash"] = df["hash"].apply(lambda x: f"..{x[-6:]}")
+        df["updated"] = df["updated"].apply(time_str)
         print(tabulate(df, headers="keys"))
 
     elif kind.startswith("func"):
@@ -1004,12 +989,6 @@ def logs(uid, project, offset, db, watch):
 @click.option(
     "--env-file", default="", help="path to .env file to load config/variables from"
 )
-# TODO: Remove --ensure-project in 1.5.0
-@click.option(
-    "--ensure-project",
-    is_flag=True,
-    help="ensure the project exists, if not, create project",
-)
 @click.option(
     "--save/--no-save",
     default=True,
@@ -1024,13 +1003,6 @@ def logs(uid, project, offset, db, watch):
     "https://apscheduler.readthedocs.io/en/3.x/modules/triggers/cron.html#module-apscheduler.triggers.cron."
     "For using the pre-defined workflow's schedule, set --schedule 'true'",
 )
-# TODO: Remove in 1.5.0
-@click.option(
-    "--overwrite-schedule",
-    "-os",
-    is_flag=True,
-    help="Overwrite a schedule when submitting a new one with the same name.",
-)
 @click.option(
     "--save-secrets",
     is_flag=True,
@@ -1068,10 +1040,8 @@ def project(
     local,
     env_file,
     timeout,
-    ensure_project,
     schedule,
     notifications,
-    overwrite_schedule,
     save_secrets,
     save,
 ):
@@ -1079,13 +1049,6 @@ def project(
     if env_file:
         mlrun.set_env_from_file(env_file)
 
-    if ensure_project:
-        warnings.warn(
-            "'ensure_project' is deprecated and will be removed in 1.5.0, use 'save' (True by default) instead. ",
-            # TODO: Remove this in 1.5.0
-            FutureWarning,
-        )
-
     if db:
         mlconf.dbpath = db
 
@@ -1168,7 +1131,6 @@ def project(
                 local=local,
                 schedule=schedule,
                 timeout=timeout,
-                overwrite=overwrite_schedule,
             )
         except Exception as err:
             print(traceback.format_exc())

mlrun/api/api/api.py

@@ -41,6 +41,7 @@ from mlrun.api.api.endpoints import (
     secrets,
     submit,
     tags,
+    workflows,
 )
 
 api_router = APIRouter(dependencies=[Depends(mlrun.api.api.deps.verify_api_state)])
@@ -145,3 +146,8 @@ api_router.include_router(
     tags=["internal"],
     dependencies=[Depends(mlrun.api.api.deps.authenticate_request)],
 )
+api_router.include_router(
+    workflows.router,
+    tags=["workflows"],
+    dependencies=[Depends(mlrun.api.api.deps.authenticate_request)],
+)

mlrun/api/api/endpoints/feature_store.py

@@ -408,10 +408,6 @@ async def ingest_feature_set(
             mlrun.common.schemas.AuthorizationAction.read,
             auth_info,
         )
-    # Need to override the default rundb since we're in the server.
-    # this is done so further down the flow when running the function created for ingestion we won't access the httpdb
-    # but rather "understand" that we are running on server side and call the DB.
-    await run_in_threadpool(feature_set._override_run_db, db_session)
 
     if ingest_parameters.targets:
         data_targets = [

mlrun/api/api/endpoints/files.py

@@ -31,7 +31,13 @@ from mlrun.utils import logger
 router = fastapi.APIRouter()
 
 
-@router.get("/files")
+# TODO: Remove in 1.7.0
+@router.get(
+    "/files",
+    deprecated=True,
+    description="'/files' and '/filestat' will be removed in 1.7.0, "
+    "use /projects/{project}/files instead.",
+)
 def get_files(
     schema: str = "",
     objpath: str = fastapi.Query("", alias="path"),
@@ -73,7 +79,13 @@ async def get_files_with_project_secrets(
     )
 
 
-@router.get("/filestat")
+# TODO: Remove in 1.7.0
+@router.get(
+    "/filestat",
+    deprecated=True,
+    description="'/files' and '/filestat' will be removed in 1.7.0, "
+    "use /projects/{project}/filestat instead.",
+)
 def get_filestat(
     schema: str = "",
     path: str = "",

mlrun/api/api/endpoints/frontend_spec.py

@@ -20,6 +20,7 @@ import semver
 import mlrun.api.api.deps
 import mlrun.api.utils.builder
 import mlrun.api.utils.clients.iguazio
+import mlrun.api.utils.runtimes.nuclio
 import mlrun.common.schemas
 import mlrun.runtimes
 import mlrun.runtimes.utils
@@ -117,7 +118,7 @@ def _resolve_feature_flags() -> mlrun.common.schemas.FeatureFlags:
     nuclio_streams = mlrun.common.schemas.NuclioStreamsFeatureFlag.disabled
 
     if mlrun.mlconf.get_parsed_igz_version() and semver.VersionInfo.parse(
-        mlrun.runtimes.utils.resolve_nuclio_version()
+        mlrun.api.utils.runtimes.nuclio.resolve_nuclio_version()
     ) >= semver.VersionInfo.parse("1.7.8"):
         nuclio_streams = mlrun.common.schemas.NuclioStreamsFeatureFlag.enabled
 

mlrun/api/api/endpoints/functions.py

@@ -34,7 +34,7 @@ from fastapi.concurrency import run_in_threadpool
 from kubernetes.client.rest import ApiException
 from sqlalchemy.orm import Session
 
-import mlrun.api.crud
+import mlrun.api.crud.model_monitoring.deployment
 import mlrun.api.crud.runtimes.nuclio.function
 import mlrun.api.db.session
 import mlrun.api.launcher
@@ -44,19 +44,22 @@ import mlrun.api.utils.clients.chief
 import mlrun.api.utils.singletons.k8s
 import mlrun.api.utils.singletons.project_member
 import mlrun.common.model_monitoring
+import mlrun.common.model_monitoring.helpers
 import mlrun.common.schemas
 from mlrun.api.api import deps
 from mlrun.api.api.utils import get_run_db_instance, log_and_raise, log_path
 from mlrun.api.crud.secrets import Secrets, SecretsClientType
 from mlrun.api.utils.builder import build_runtime
 from mlrun.api.utils.singletons.scheduler import get_scheduler
+from mlrun.common.helpers import parse_versioned_object_uri
+from mlrun.common.model_monitoring.helpers import parse_model_endpoint_store_prefix
 from mlrun.config import config
 from mlrun.errors import MLRunRuntimeError, err_to_str
+from mlrun.model_monitoring.tracking_policy import TrackingPolicy
 from mlrun.run import new_function
 from mlrun.runtimes import RuntimeKinds, ServingRuntime, runtime_resources_map
 from mlrun.runtimes.utils import get_item_name
-from mlrun.utils import get_in, logger, parse_versioned_object_uri, update_in
-from mlrun.utils.model_monitoring import parse_model_endpoint_store_prefix
+from mlrun.utils import get_in, logger, update_in
 
 router = APIRouter()
 
@@ -448,21 +451,21 @@ async def build_status(
 
 
 def _handle_job_deploy_status(
-    db_session,
-    fn,
-    name,
-    project,
-    tag,
-    offset,
-    logs,
+    db_session: Session,
+    fn: dict,
+    name: str,
+    project: str,
+    tag: str,
+    offset: int,
+    logs: bool,
 ):
     # job deploy status
-    state = get_in(fn, "status.state", "")
+    function_state = get_in(fn, "status.state", "")
     pod = get_in(fn, "status.build_pod", "")
     image = get_in(fn, "spec.build.image", "")
     out = b""
     if not pod:
-        if state == mlrun.common.schemas.FunctionState.ready:
+        if function_state == mlrun.common.schemas.FunctionState.ready:
             # when the function has been built we set the created image into the `spec.image` for reference see at the
             # end of the function where we resolve if the status is ready and then set the spec.build.image to
             # spec.image
@@ -474,17 +477,19 @@ def _handle_job_deploy_status(
             content=out,
             media_type="text/plain",
             headers={
-                "function_status": state,
+                "function_status": function_state,
                 "function_image": image,
                 "builder_pod": pod,
             },
         )
 
     # read from log file
-    terminal_states = ["failed", "error", "ready"]
     log_file = log_path(project, f"build_{name}__{tag or 'latest'}")
-    if state in terminal_states and log_file.exists():
-        if state == mlrun.common.schemas.FunctionState.ready:
+    if (
+        function_state in mlrun.common.schemas.FunctionState.terminal_states()
+        and log_file.exists()
+    ):
+        if function_state == mlrun.common.schemas.FunctionState.ready:
             # when the function has been built we set the created image into the `spec.image` for reference see at the
             # end of the function where we resolve if the status is ready and then set the spec.build.image to
             # spec.image
@@ -500,40 +505,65 @@ def _handle_job_deploy_status(
             content=out,
             media_type="text/plain",
             headers={
-                "x-mlrun-function-status": state,
-                "function_status": state,
+                "x-mlrun-function-status": function_state,
+                "function_status": function_state,
                 "function_image": image,
                 "builder_pod": pod,
             },
         )
 
-    # TODO: change state to pod_status
-    state = mlrun.api.utils.singletons.k8s.get_k8s_helper(silent=False).get_pod_status(
-        pod
+    build_pod_state = mlrun.api.utils.singletons.k8s.get_k8s_helper(
+        silent=False
+    ).get_pod_status(pod)
+    logger.debug(
+        "Resolved pod status",
+        function_name=name,
+        pod_status=build_pod_state,
+        pod_name=pod,
     )
-    logger.info("Resolved pod status", pod_status=state, pod_name=pod)
 
-    if state == "succeeded":
-        logger.info("Build completed successfully")
-        state = mlrun.common.schemas.FunctionState.ready
-    if state in ["failed", "error"]:
-        logger.error("Build failed", pod_name=pod, pod_status=state)
-        state = mlrun.common.schemas.FunctionState.error
+    normalized_pod_function_state = (
+        mlrun.common.schemas.FunctionState.get_function_state_from_pod_state(
+            build_pod_state
+        )
+    )
+    if normalized_pod_function_state == mlrun.common.schemas.FunctionState.ready:
+        logger.info(
+            "Build completed successfully",
+            function_name=name,
+            pod=pod,
+            pod_state=build_pod_state,
+        )
+    elif normalized_pod_function_state == mlrun.common.schemas.FunctionState.error:
+        logger.error(
+            "Build failed", function_name=name, pod_name=pod, pod_status=build_pod_state
+        )
 
-    if (logs and state != "pending") or state in terminal_states:
+    if (
+        (
+            logs
+            and normalized_pod_function_state
+            != mlrun.common.schemas.FunctionState.pending
+        )
+        or normalized_pod_function_state
+        in mlrun.common.schemas.FunctionState.terminal_states()
+    ):
         try:
             resp = mlrun.api.utils.singletons.k8s.get_k8s_helper(silent=False).logs(pod)
         except ApiException as exc:
             logger.warning(
                 "Failed to get build logs",
                 function_name=name,
-                function_state=state,
+                function_state=normalized_pod_function_state,
                 pod=pod,
                 exc_info=exc,
             )
             resp = ""
 
-        if state in terminal_states:
+        if (
+            normalized_pod_function_state
+            in mlrun.common.schemas.FunctionState.terminal_states()
+        ):
             # TODO: move to log collector
             log_file.parent.mkdir(parents=True, exist_ok=True)
             with log_file.open("wb") as fp:
@@ -543,28 +573,31 @@ def _handle_job_deploy_status(
             # begin from the offset number and then encode
             out = resp[offset:].encode()
 
-    update_in(fn, "status.state", state)
-    if state == mlrun.common.schemas.FunctionState.ready:
-        update_in(fn, "spec.image", image)
+    # check if the previous function state is different from the current build pod state, if that is the case then
+    # update the function and store to the database
+    if function_state != normalized_pod_function_state:
+        update_in(fn, "status.state", normalized_pod_function_state)
 
-    versioned = False
-    if state == mlrun.common.schemas.FunctionState.ready:
-        versioned = True
-    mlrun.api.crud.Functions().store_function(
-        db_session,
-        fn,
-        name,
-        project,
-        tag,
-        versioned=versioned,
-    )
+        versioned = False
+        if normalized_pod_function_state == mlrun.common.schemas.FunctionState.ready:
+            update_in(fn, "spec.image", image)
+            versioned = True
+
+        mlrun.api.crud.Functions().store_function(
+            db_session,
+            fn,
+            name,
+            project,
+            tag,
+            versioned=versioned,
+        )
 
     return Response(
         content=out,
         media_type="text/plain",
         headers={
-            "x-mlrun-function-status": state,
-            "function_status": state,
+            "x-mlrun-function-status": normalized_pod_function_state,
+            "function_status": normalized_pod_function_state,
             "function_image": image,
             "builder_pod": pod,
         },
@@ -673,9 +706,14 @@ def _build_function(
             reason=f"runtime error: {err_to_str(err)}",
         )
     try:
+        # connect to run db
         run_db = get_run_db_instance(db_session)
         fn.set_db_connection(run_db)
-        mlrun.api.launcher.ServerSideLauncher.enrich_runtime(runtime=fn)
+
+        # enrich runtime with project defaults
+        launcher = mlrun.api.launcher.ServerSideLauncher()
+        launcher.enrich_runtime(runtime=fn)
+
         fn.save(versioned=False)
         if fn.kind in RuntimeKinds.nuclio_runtimes():
             mlrun.api.api.utils.apply_enrichment_and_validation_on_function(
@@ -695,11 +733,13 @@ def _build_function(
                             model_monitoring_access_key = _process_model_monitoring_secret(
                                 db_session,
                                 fn.metadata.project,
-                                mlrun.common.model_monitoring.ProjectSecretKeys.ACCESS_KEY,
+                                mlrun.common.schemas.model_monitoring.ProjectSecretKeys.ACCESS_KEY,
                             )
 
-                            stream_path = mlrun.utils.model_monitoring.get_stream_path(
-                                project=fn.metadata.project
+                            stream_path = (
+                                mlrun.api.crud.model_monitoring.get_stream_path(
+                                    project=fn.metadata.project
+                                )
                             )
 
                             if stream_path.startswith("v3io://"):
@@ -712,19 +752,15 @@ def _build_function(
 
                         if fn.spec.tracking_policy:
                             # Convert to `TrackingPolicy` object as `fn.spec.tracking_policy` is provided as a dict
-                            fn.spec.tracking_policy = (
-                                mlrun.utils.model_monitoring.TrackingPolicy.from_dict(
-                                    fn.spec.tracking_policy
-                                )
+                            fn.spec.tracking_policy = TrackingPolicy.from_dict(
+                                fn.spec.tracking_policy
                             )
                         else:
                             # Initialize tracking policy with default values
-                            fn.spec.tracking_policy = (
-                                mlrun.utils.model_monitoring.TrackingPolicy()
-                            )
+                            fn.spec.tracking_policy = TrackingPolicy()
 
                         # deploy both model monitoring stream and model monitoring batch job
-                        mlrun.api.crud.ModelEndpoints().deploy_monitoring_functions(
+                        mlrun.api.crud.model_monitoring.deployment.MonitoringDeployment().deploy_monitoring_functions(
                             project=fn.metadata.project,
                             db_session=db_session,
                             auth_info=auth_info,

mlrun/api/api/endpoints/grafana_proxy.py

@@ -21,11 +21,10 @@ from fastapi import APIRouter, Depends, Request, Response
 from fastapi.concurrency import run_in_threadpool
 from sqlalchemy.orm import Session
 
-import mlrun.api.crud
+import mlrun.api.crud.model_monitoring.deployment
 import mlrun.api.crud.model_monitoring.grafana
-import mlrun.api.utils.auth.verifier
-import mlrun.common.model_monitoring
-import mlrun.common.schemas
+import mlrun.api.crud.model_monitoring.helpers
+import mlrun.common.schemas.model_monitoring.grafana
 from mlrun.api.api import deps
 
 router = APIRouter(prefix="/grafana-proxy/model-endpoints")
@@ -53,7 +52,7 @@ def grafana_proxy_model_endpoints_check_connection(
     connectivity.
     """
     if not mlrun.mlconf.is_ce_mode():
-        mlrun.api.crud.ModelEndpoints().get_access_key(auth_info)
+        mlrun.api.crud.model_monitoring.helpers.get_access_key(auth_info)
     return Response(status_code=HTTPStatus.OK.value)
 
 
@@ -77,7 +76,7 @@ async def grafana_proxy_model_endpoints_search(
     :return: List of results. e.g. list of available project names.
     """
     if not mlrun.mlconf.is_ce_mode():
-        mlrun.api.crud.ModelEndpoints().get_access_key(auth_info)
+        mlrun.api.crud.model_monitoring.helpers.get_access_key(auth_info)
     body = await request.json()
     query_parameters = mlrun.api.crud.model_monitoring.grafana.parse_search_parameters(
         body
@@ -104,8 +103,8 @@ async def grafana_proxy_model_endpoints_search(
     "/query",
     response_model=List[
         Union[
-            mlrun.common.schemas.GrafanaTable,
-            mlrun.common.schemas.GrafanaTimeSeriesTarget,
+            mlrun.common.schemas.model_monitoring.grafana.GrafanaTable,
+            mlrun.common.schemas.model_monitoring.grafana.GrafanaTimeSeriesTarget,
         ]
     ],
 )
@@ -114,7 +113,8 @@ async def grafana_proxy_model_endpoints_query(
     auth_info: mlrun.common.schemas.AuthInfo = Depends(deps.authenticate_request),
 ) -> List[
     Union[
-        mlrun.common.schemas.GrafanaTable, mlrun.common.schemas.GrafanaTimeSeriesTarget
+        mlrun.common.schemas.model_monitoring.grafana.GrafanaTable,
+        mlrun.common.schemas.model_monitoring.grafana.GrafanaTimeSeriesTarget,
     ]
 ]:
     """

mlrun/api/api/endpoints/logs.py

@@ -21,10 +21,17 @@ import mlrun.api.crud
 import mlrun.api.utils.auth.verifier
 import mlrun.common.schemas
 
-router = fastapi.APIRouter(prefix="/log/{project}")
+router = fastapi.APIRouter()
 
 
-@router.post("/{uid}")
+# TODO: remove /log/{project}/{uid} in 1.7.0
+@router.post(
+    "/log/{project}/{uid}",
+    deprecated=True,
+    description="/log/{project}/{uid} is deprecated in 1.5.0 and will be removed in 1.7.0, "
+    "use /projects/{project}/logs/{uid} instead",
+)
+@router.post("/projects/{project}/logs/{uid}")
 async def store_log(
     request: fastapi.Request,
     project: str,
@@ -52,7 +59,14 @@ async def store_log(
     return {}
 
 
-@router.get("/{uid}")
+# TODO: remove /log/{project}/{uid} in 1.7.0
+@router.get(
+    "/log/{project}/{uid}",
+    deprecated=True,
+    description="/log/{project}/{uid} is deprecated in 1.5.0 and will be removed in 1.7.0, "
+    "use /projects/{project}/logs/{uid} instead",
+)
+@router.get("/projects/{project}/logs/{uid}")
 async def get_log(
     project: str,
     uid: str,

mlrun/api/api/endpoints/model_endpoints.py

@@ -23,7 +23,8 @@ from fastapi.concurrency import run_in_threadpool
 from sqlalchemy.orm import Session
 
 import mlrun.api.api.deps
-import mlrun.api.crud
+import mlrun.api.crud.model_monitoring.deployment
+import mlrun.api.crud.model_monitoring.helpers
 import mlrun.api.utils.auth.verifier
 import mlrun.common.schemas
 from mlrun.errors import MLRunConflictError
@@ -64,7 +65,7 @@ async def create_or_patch(
         auth_info,
     )
     # get_access_key will validate the needed auth (which is used later) exists in the request
-    mlrun.api.crud.ModelEndpoints().get_access_key(auth_info)
+    mlrun.api.crud.model_monitoring.helpers.get_access_key(auth_info)
     if project != model_endpoint.metadata.project:
         raise MLRunConflictError(
             f"Can't store endpoint of project {model_endpoint.metadata.project} into project {project}"