zenml-nightly 0.75.0.dev20250312__py3-none-any.whl → 0.75.0.dev20250314__py3-none-any.whl

zenml/zen_server/routers/models_endpoints.py

@@ -13,39 +13,35 @@
 #  permissions and limitations under the License.
 """Endpoint definitions for models."""
 
-from typing import Union
+from typing import Optional, Union
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, Security
 
 from zenml.constants import (
     API,
-    MODEL_VERSIONS,
     MODELS,
     VERSION_1,
 )
 from zenml.models import (
     ModelFilter,
+    ModelRequest,
     ModelResponse,
     ModelUpdate,
-    ModelVersionFilter,
-    ModelVersionResponse,
     Page,
 )
 from zenml.zen_server.auth import AuthContext, authorize
 from zenml.zen_server.exceptions import error_response
 from zenml.zen_server.feature_gate.endpoint_utils import report_decrement
 from zenml.zen_server.rbac.endpoint_utils import (
+    verify_permissions_and_create_entity,
     verify_permissions_and_delete_entity,
     verify_permissions_and_get_entity,
     verify_permissions_and_list_entities,
     verify_permissions_and_update_entity,
 )
 from zenml.zen_server.rbac.models import ResourceType
-from zenml.zen_server.rbac.utils import (
-    dehydrate_page,
-    get_allowed_resource_ids,
-)
+from zenml.zen_server.routers.projects_endpoints import workspace_router
 from zenml.zen_server.utils import (
     handle_exceptions,
     make_dependable,
@@ -64,9 +60,45 @@ router = APIRouter(
 )
 
 
+@router.post(
+    "",
+    responses={401: error_response, 409: error_response, 422: error_response},
+)
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.post(
+    "/{project_name_or_id}" + MODELS,
+    responses={401: error_response, 409: error_response, 422: error_response},
+    deprecated=True,
+    tags=["models"],
+)
+@handle_exceptions
+def create_model(
+    model: ModelRequest,
+    project_name_or_id: Optional[Union[str, UUID]] = None,
+    _: AuthContext = Security(authorize),
+) -> ModelResponse:
+    """Creates a model.
+
+    Args:
+        model: Model to create.
+        project_name_or_id: Optional name or ID of the project.
+
+    Returns:
+        The created model.
+    """
+    if project_name_or_id:
+        project = zen_store().get_project(project_name_or_id)
+        model.project = project.id
+
+    return verify_permissions_and_create_entity(
+        request_model=model,
+        create_method=zen_store().create_model,
+    )
+
+
 @router.get(
     "",
-    response_model=Page[ModelResponse],
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions
@@ -95,20 +127,19 @@ def list_models(
 
 
 @router.get(
-    "/{model_name_or_id}",
-    response_model=ModelResponse,
+    "/{model_id}",
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions
 def get_model(
-    model_name_or_id: Union[str, UUID],
+    model_id: UUID,
     hydrate: bool = True,
     _: AuthContext = Security(authorize),
 ) -> ModelResponse:
     """Get a model by name or ID.
 
     Args:
-        model_name_or_id: The name or ID of the model to get.
+        model_id: The ID of the model to get.
         hydrate: Flag deciding whether to hydrate the output model(s)
             by including metadata fields in the response.
 
@@ -116,13 +147,12 @@ def get_model(
         The model with the given name or ID.
     """
     return verify_permissions_and_get_entity(
-        id=model_name_or_id, get_method=zen_store().get_model, hydrate=hydrate
+        id=model_id, get_method=zen_store().get_model, hydrate=hydrate
     )
 
 
 @router.put(
     "/{model_id}",
-    response_model=ModelResponse,
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions
@@ -149,21 +179,21 @@ def update_model(
 
 
 @router.delete(
-    "/{model_name_or_id}",
+    "/{model_id}",
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions
 def delete_model(
-    model_name_or_id: Union[str, UUID],
+    model_id: UUID,
     _: AuthContext = Security(authorize),
 ) -> None:
-    """Delete a model by name or ID.
+    """Delete a model by ID.
 
     Args:
-        model_name_or_id: The name or ID of the model to delete.
+        model_id: The ID of the model to delete.
     """
     model = verify_permissions_and_delete_entity(
-        id=model_name_or_id,
+        id=model_id,
         get_method=zen_store().get_model,
         delete_method=zen_store().delete_model,
     )
@@ -171,52 +201,3 @@ def delete_model(
     if server_config().feature_gate_enabled:
         if ResourceType.MODEL in server_config().reportable_resources:
             report_decrement(ResourceType.MODEL, resource_id=model.id)
-
-
-#################
-# Model Versions
-#################
-
-
-@router.get(
-    "/{model_name_or_id}" + MODEL_VERSIONS,
-    response_model=Page[ModelVersionResponse],
-    responses={401: error_response, 404: error_response, 422: error_response},
-)
-@handle_exceptions
-def list_model_versions(
-    model_name_or_id: Union[str, UUID],
-    model_version_filter_model: ModelVersionFilter = Depends(
-        make_dependable(ModelVersionFilter)
-    ),
-    hydrate: bool = False,
-    auth_context: AuthContext = Security(authorize),
-) -> Page[ModelVersionResponse]:
-    """Get model versions according to query filters.
-
-    This endpoint serves the purpose of allowing scoped filtering by model_id.
-
-    Args:
-        model_name_or_id: The name or ID of the model to list in.
-        model_version_filter_model: Filter model used for pagination, sorting,
-            filtering.
-        hydrate: Flag deciding whether to hydrate the output model(s)
-            by including metadata fields in the response.
-        auth_context: The authentication context.
-
-    Returns:
-        The model versions according to query filters.
-    """
-    allowed_model_ids = get_allowed_resource_ids(
-        resource_type=ResourceType.MODEL
-    )
-    model_version_filter_model.configure_rbac(
-        authenticated_user_id=auth_context.user.id, model_id=allowed_model_ids
-    )
-
-    model_versions = zen_store().list_model_versions(
-        model_name_or_id=model_name_or_id,
-        model_version_filter_model=model_version_filter_model,
-        hydrate=hydrate,
-    )
-    return dehydrate_page(model_versions)

zenml/zen_server/routers/pipeline_builds_endpoints.py

@@ -13,6 +13,7 @@
 #  permissions and limitations under the License.
 """Endpoint definitions for builds."""
 
+from typing import Optional, Union
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, Security
@@ -21,16 +22,19 @@ from zenml.constants import API, PIPELINE_BUILDS, VERSION_1
 from zenml.models import (
     Page,
     PipelineBuildFilter,
+    PipelineBuildRequest,
     PipelineBuildResponse,
 )
 from zenml.zen_server.auth import AuthContext, authorize
 from zenml.zen_server.exceptions import error_response
 from zenml.zen_server.rbac.endpoint_utils import (
+    verify_permissions_and_create_entity,
     verify_permissions_and_delete_entity,
     verify_permissions_and_get_entity,
     verify_permissions_and_list_entities,
 )
 from zenml.zen_server.rbac.models import ResourceType
+from zenml.zen_server.routers.projects_endpoints import workspace_router
 from zenml.zen_server.utils import (
     handle_exceptions,
     make_dependable,
@@ -44,16 +48,61 @@ router = APIRouter(
 )
 
 
+@router.post(
+    "",
+    responses={401: error_response, 409: error_response, 422: error_response},
+)
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.post(
+    "/{project_name_or_id}" + PIPELINE_BUILDS,
+    responses={401: error_response, 409: error_response, 422: error_response},
+    deprecated=True,
+    tags=["builds"],
+)
+@handle_exceptions
+def create_build(
+    build: PipelineBuildRequest,
+    project_name_or_id: Optional[Union[str, UUID]] = None,
+    _: AuthContext = Security(authorize),
+) -> PipelineBuildResponse:
+    """Creates a build, optionally in a specific project.
+
+    Args:
+        build: Build to create.
+        project_name_or_id: Optional name or ID of the project.
+
+    Returns:
+        The created build.
+    """
+    if project_name_or_id:
+        project = zen_store().get_project(project_name_or_id)
+        build.project = project.id
+
+    return verify_permissions_and_create_entity(
+        request_model=build,
+        create_method=zen_store().create_build,
+    )
+
+
 @router.get(
     "",
-    response_model=Page[PipelineBuildResponse],
     responses={401: error_response, 404: error_response, 422: error_response},
 )
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.get(
+    "/{project_name_or_id}" + PIPELINE_BUILDS,
+    responses={401: error_response, 404: error_response, 422: error_response},
+    deprecated=True,
+    tags=["builds"],
+)
 @handle_exceptions
 def list_builds(
     build_filter_model: PipelineBuildFilter = Depends(
         make_dependable(PipelineBuildFilter)
     ),
+    project_name_or_id: Optional[Union[str, UUID]] = None,
     hydrate: bool = False,
     _: AuthContext = Security(authorize),
 ) -> Page[PipelineBuildResponse]:
@@ -62,12 +111,16 @@ def list_builds(
     Args:
         build_filter_model: Filter model used for pagination, sorting,
             filtering.
+        project_name_or_id: Optional name or ID of the project to filter by.
         hydrate: Flag deciding whether to hydrate the output model(s)
             by including metadata fields in the response.
 
     Returns:
-        List of build objects.
+        List of build objects matching the filter criteria.
     """
+    if project_name_or_id:
+        build_filter_model.project = project_name_or_id
+
     return verify_permissions_and_list_entities(
         filter_model=build_filter_model,
         resource_type=ResourceType.PIPELINE_BUILD,
@@ -78,7 +131,6 @@ def list_builds(
 
 @router.get(
     "/{build_id}",
-    response_model=PipelineBuildResponse,
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions

zenml/zen_server/routers/pipeline_deployments_endpoints.py

@@ -13,6 +13,7 @@
 #  permissions and limitations under the License.
 """Endpoint definitions for deployments."""
 
+from typing import Optional, Union
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, Security
@@ -21,16 +22,19 @@ from zenml.constants import API, PIPELINE_DEPLOYMENTS, VERSION_1
 from zenml.models import (
     Page,
     PipelineDeploymentFilter,
+    PipelineDeploymentRequest,
     PipelineDeploymentResponse,
 )
 from zenml.zen_server.auth import AuthContext, authorize
 from zenml.zen_server.exceptions import error_response
 from zenml.zen_server.rbac.endpoint_utils import (
+    verify_permissions_and_create_entity,
     verify_permissions_and_delete_entity,
     verify_permissions_and_get_entity,
     verify_permissions_and_list_entities,
 )
 from zenml.zen_server.rbac.models import ResourceType
+from zenml.zen_server.routers.projects_endpoints import workspace_router
 from zenml.zen_server.utils import (
     handle_exceptions,
     make_dependable,
@@ -46,30 +50,79 @@ router = APIRouter(
 )
 
 
+@router.post(
+    "",
+    responses={401: error_response, 409: error_response, 422: error_response},
+)
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.post(
+    "/{project_name_or_id}" + PIPELINE_DEPLOYMENTS,
+    responses={401: error_response, 409: error_response, 422: error_response},
+    deprecated=True,
+    tags=["deployments"],
+)
+@handle_exceptions
+def create_deployment(
+    deployment: PipelineDeploymentRequest,
+    project_name_or_id: Optional[Union[str, UUID]] = None,
+    _: AuthContext = Security(authorize),
+) -> PipelineDeploymentResponse:
+    """Creates a deployment.
+
+    Args:
+        deployment: Deployment to create.
+        project_name_or_id: Optional name or ID of the project.
+
+    Returns:
+        The created deployment.
+    """
+    if project_name_or_id:
+        project = zen_store().get_project(project_name_or_id)
+        deployment.project = project.id
+
+    return verify_permissions_and_create_entity(
+        request_model=deployment,
+        create_method=zen_store().create_deployment,
+    )
+
+
 @router.get(
     "",
-    response_model=Page[PipelineDeploymentResponse],
     responses={401: error_response, 404: error_response, 422: error_response},
 )
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.get(
+    "/{project_name_or_id}" + PIPELINE_DEPLOYMENTS,
+    responses={401: error_response, 404: error_response, 422: error_response},
+    deprecated=True,
+    tags=["deployments"],
+)
 @handle_exceptions
 def list_deployments(
     deployment_filter_model: PipelineDeploymentFilter = Depends(
         make_dependable(PipelineDeploymentFilter)
     ),
+    project_name_or_id: Optional[Union[str, UUID]] = None,
     hydrate: bool = False,
     _: AuthContext = Security(authorize),
 ) -> Page[PipelineDeploymentResponse]:
-    """Gets a list of deployment.
+    """Gets a list of deployments.
 
     Args:
         deployment_filter_model: Filter model used for pagination, sorting,
             filtering.
+        project_name_or_id: Optional name or ID of the project to filter by.
         hydrate: Flag deciding whether to hydrate the output model(s)
             by including metadata fields in the response.
 
     Returns:
-        List of deployment objects.
+        List of deployment objects matching the filter criteria.
     """
+    if project_name_or_id:
+        deployment_filter_model.project = project_name_or_id
+
     return verify_permissions_and_list_entities(
         filter_model=deployment_filter_model,
         resource_type=ResourceType.PIPELINE_DEPLOYMENT,
@@ -80,7 +133,6 @@ def list_deployments(
 
 @router.get(
     "/{deployment_id}",
-    response_model=PipelineDeploymentResponse,
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions

zenml/zen_server/routers/pipelines_endpoints.py

@@ -13,6 +13,7 @@
 #  permissions and limitations under the License.
 """Endpoint definitions for pipelines."""
 
+from typing import Optional, Union
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, Security
@@ -26,6 +27,7 @@ from zenml.constants import (
 from zenml.models import (
     Page,
     PipelineFilter,
+    PipelineRequest,
     PipelineResponse,
     PipelineRunFilter,
     PipelineRunResponse,
@@ -33,14 +35,18 @@ from zenml.models import (
 )
 from zenml.zen_server.auth import AuthContext, authorize
 from zenml.zen_server.exceptions import error_response
-from zenml.zen_server.feature_gate.endpoint_utils import report_decrement
+from zenml.zen_server.feature_gate.endpoint_utils import (
+    report_decrement,
+)
 from zenml.zen_server.rbac.endpoint_utils import (
+    verify_permissions_and_create_entity,
     verify_permissions_and_delete_entity,
     verify_permissions_and_get_entity,
     verify_permissions_and_list_entities,
     verify_permissions_and_update_entity,
 )
 from zenml.zen_server.rbac.models import ResourceType
+from zenml.zen_server.routers.projects_endpoints import workspace_router
 from zenml.zen_server.utils import (
     handle_exceptions,
     make_dependable,
@@ -55,15 +61,70 @@ router = APIRouter(
 )
 
 
+@router.post(
+    "",
+    responses={401: error_response, 409: error_response, 422: error_response},
+)
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.post(
+    "/{project_name_or_id}" + PIPELINES,
+    responses={401: error_response, 409: error_response, 422: error_response},
+    deprecated=True,
+    tags=["pipelines"],
+)
+@handle_exceptions
+def create_pipeline(
+    pipeline: PipelineRequest,
+    project_name_or_id: Optional[Union[str, UUID]] = None,
+    _: AuthContext = Security(authorize),
+) -> PipelineResponse:
+    """Creates a pipeline.
+
+    Args:
+        pipeline: Pipeline to create.
+        project_name_or_id: Optional name or ID of the project.
+
+    Returns:
+        The created pipeline.
+    """
+    if project_name_or_id:
+        project = zen_store().get_project(project_name_or_id)
+        pipeline.project = project.id
+
+    # We limit pipeline namespaces, not pipeline versions
+    skip_entitlements = (
+        zen_store().count_pipelines(
+            PipelineFilter(name=pipeline.name, project=pipeline.project)
+        )
+        > 0
+    )
+
+    return verify_permissions_and_create_entity(
+        request_model=pipeline,
+        create_method=zen_store().create_pipeline,
+        skip_entitlements=skip_entitlements,
+    )
+
+
 @router.get(
     "",
     responses={401: error_response, 404: error_response, 422: error_response},
 )
+# TODO: the workspace scoped endpoint is only kept for dashboard compatibility
+# and can be removed after the migration
+@workspace_router.get(
+    "/{project_name_or_id}" + PIPELINES,
+    responses={401: error_response, 404: error_response, 422: error_response},
+    deprecated=True,
+    tags=["pipelines"],
+)
 @handle_exceptions
 def list_pipelines(
     pipeline_filter_model: PipelineFilter = Depends(
         make_dependable(PipelineFilter)
     ),
+    project_name_or_id: Optional[Union[str, UUID]] = None,
     hydrate: bool = False,
     _: AuthContext = Security(authorize),
 ) -> Page[PipelineResponse]:
@@ -72,12 +133,16 @@ def list_pipelines(
     Args:
         pipeline_filter_model: Filter model used for pagination, sorting,
             filtering.
+        project_name_or_id: Optional name or ID of the project to filter by.
         hydrate: Flag deciding whether to hydrate the output model(s)
             by including metadata fields in the response.
 
     Returns:
-        List of pipeline objects.
+        List of pipeline objects matching the filter criteria.
     """
+    if project_name_or_id:
+        pipeline_filter_model.project = project_name_or_id
+
     return verify_permissions_and_list_entities(
         filter_model=pipeline_filter_model,
         resource_type=ResourceType.PIPELINE,
@@ -160,7 +225,9 @@ def delete_pipeline(
 
     should_decrement = (
         ResourceType.PIPELINE in server_config().reportable_resources
-        and zen_store().count_pipelines(PipelineFilter(name=pipeline.name))
+        and zen_store().count_pipelines(
+            PipelineFilter(name=pipeline.name, project=pipeline.project.id)
+        )
         == 0
     )
     if should_decrement:

zenml/zen_server/routers/plugin_endpoints.py

@@ -81,7 +81,6 @@ def list_flavors(
 
 @plugin_router.get(
     "/{name}",
-    response_model=BasePluginFlavorResponse,
     responses={401: error_response, 404: error_response, 422: error_response},
 )
 @handle_exceptions