zenml-nightly 0.64.0.dev20240811__py3-none-any.whl → 0.66.0.dev20240910__py3-none-any.whl

zenml/zen_server/deploy/helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zenml
-version: "0.64.0"
+version: "0.66.0"
 description: Open source MLOps framework for portable production ready ML pipelines
 keywords:
 - mlops

zenml/zen_server/deploy/helm/README.md

@@ -20,8 +20,8 @@ ZenML is an open-source MLOps framework designed to help you create robust, main
 To install the ZenML chart directly from Amazon ECR, use the following command:
 
 ```bash
-# example command for version 0.64.0
-helm install my-zenml oci://public.ecr.aws/zenml/zenml --version 0.64.0
+# example command for version 0.66.0
+helm install my-zenml oci://public.ecr.aws/zenml/zenml --version 0.66.0
 ```
 
 Note: Ensure you have OCI support enabled in your Helm client and that you are authenticated with Amazon ECR.

zenml/zen_server/routers/service_connectors_endpoints.py

@@ -30,16 +30,14 @@ from zenml.constants import (
 from zenml.models import (
     Page,
     ServiceConnectorFilter,
+    ServiceConnectorInfo,
     ServiceConnectorRequest,
+    ServiceConnectorResourcesInfo,
     ServiceConnectorResourcesModel,
     ServiceConnectorResponse,
     ServiceConnectorTypeModel,
     ServiceConnectorUpdate,
 )
-from zenml.models.v2.misc.full_stack import (
-    ServiceConnectorInfo,
-    ServiceConnectorResourcesInfo,
-)
 from zenml.service_connectors.service_connector_utils import (
     get_resources_options_from_resource_model_for_full_stack,
 )

zenml/zen_server/routers/workspaces_endpoints.py

@@ -22,7 +22,6 @@ from zenml.constants import (
     API,
     ARTIFACTS,
     CODE_REPOSITORIES,
-    FULL_STACK,
     GET_OR_CREATE,
     MODEL_VERSIONS,
     MODELS,
@@ -53,7 +52,6 @@ from zenml.models import (
     ComponentFilter,
     ComponentRequest,
     ComponentResponse,
-    FullStackRequest,
     ModelRequest,
     ModelResponse,
     ModelVersionArtifactRequest,
@@ -113,7 +111,6 @@ from zenml.zen_server.rbac.endpoint_utils import (
 )
 from zenml.zen_server.rbac.models import Action, ResourceType
 from zenml.zen_server.rbac.utils import (
-    batch_verify_permissions_for_models,
     get_allowed_resource_ids,
     verify_permission,
     verify_permission_for_model,
@@ -315,62 +312,13 @@ def list_workspace_stacks(
 def create_stack(
     workspace_name_or_id: Union[str, UUID],
     stack: StackRequest,
-    _: AuthContext = Security(authorize),
-) -> StackResponse:
-    """Creates a stack for a particular workspace.
-
-    Args:
-        workspace_name_or_id: Name or ID of the workspace.
-        stack: Stack to register.
-
-    Returns:
-        The created stack.
-
-    Raises:
-        IllegalOperationError: If the workspace specified in the stack
-            does not match the current workspace.
-    """
-    workspace = zen_store().get_workspace(workspace_name_or_id)
-
-    if stack.workspace != workspace.id:
-        raise IllegalOperationError(
-            "Creating stacks outside of the workspace scope "
-            f"of this endpoint `{workspace_name_or_id}` is "
-            f"not supported."
-        )
-
-    if stack.components:
-        components = [
-            zen_store().get_stack_component(id)
-            for ids in stack.components.values()
-            for id in ids
-        ]
-
-        batch_verify_permissions_for_models(components, action=Action.READ)
-
-    return verify_permissions_and_create_entity(
-        request_model=stack,
-        resource_type=ResourceType.STACK,
-        create_method=zen_store().create_stack,
-    )
-
-
-@router.post(
-    WORKSPACES + "/{workspace_name_or_id}" + FULL_STACK,
-    response_model=StackResponse,
-    responses={401: error_response, 409: error_response, 422: error_response},
-)
-@handle_exceptions
-def create_full_stack(
-    workspace_name_or_id: Union[str, UUID],
-    full_stack: FullStackRequest,
     auth_context: AuthContext = Security(authorize),
 ) -> StackResponse:
     """Creates a stack for a particular workspace.
 
     Args:
         workspace_name_or_id: Name or ID of the workspace.
-        full_stack: Stack to register.
+        stack: Stack to register.
         auth_context: Authentication context.
 
     Returns:
@@ -378,8 +326,9 @@ def create_full_stack(
     """
     workspace = zen_store().get_workspace(workspace_name_or_id)
 
+    # Check the service connector creation
     is_connector_create_needed = False
-    for connector_id_or_info in full_stack.service_connectors:
+    for connector_id_or_info in stack.service_connectors:
         if isinstance(connector_id_or_info, UUID):
             service_connector = zen_store().get_service_connector(
                 connector_id_or_info, hydrate=False
@@ -389,32 +338,37 @@ def create_full_stack(
             )
         else:
             is_connector_create_needed = True
+
+    # Check the component creation
     if is_connector_create_needed:
         verify_permission(
             resource_type=ResourceType.SERVICE_CONNECTOR, action=Action.CREATE
         )
-
     is_component_create_needed = False
-    for component_id_or_info in full_stack.components.values():
-        if isinstance(component_id_or_info, UUID):
-            component = zen_store().get_stack_component(
-                component_id_or_info, hydrate=False
-            )
-            verify_permission_for_model(model=component, action=Action.READ)
-        else:
-            is_component_create_needed = True
+    for components in stack.components.values():
+        for component_id_or_info in components:
+            if isinstance(component_id_or_info, UUID):
+                component = zen_store().get_stack_component(
+                    component_id_or_info, hydrate=False
+                )
+                verify_permission_for_model(
+                    model=component, action=Action.READ
+                )
+            else:
+                is_component_create_needed = True
     if is_component_create_needed:
         verify_permission(
             resource_type=ResourceType.STACK_COMPONENT,
             action=Action.CREATE,
         )
 
+    # Check the stack creation
     verify_permission(resource_type=ResourceType.STACK, action=Action.CREATE)
 
-    full_stack.user = auth_context.user.id
-    full_stack.workspace = workspace.id
+    stack.user = auth_context.user.id
+    stack.workspace = workspace.id
 
-    return zen_store().create_full_stack(full_stack)
+    return zen_store().create_stack(stack)
 
 
 @router.get(

zenml/zen_server/secure_headers.py

@@ -0,0 +1,120 @@
+#  Copyright (c) ZenML GmbH 2024. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at:
+#
+#       https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+"""Secure headers for the ZenML Server."""
+
+from typing import Optional
+
+import secure
+
+from zenml.zen_server.utils import server_config
+
+_secure_headers: Optional[secure.Secure] = None
+
+
+def secure_headers() -> secure.Secure:
+    """Return the secure headers component.
+
+    Returns:
+        The secure headers component.
+
+    Raises:
+        RuntimeError: If the secure headers component is not initialized.
+    """
+    global _secure_headers
+    if _secure_headers is None:
+        raise RuntimeError("Secure headers component not initialized")
+    return _secure_headers
+
+
+def initialize_secure_headers() -> None:
+    """Initialize the secure headers component."""
+    global _secure_headers
+
+    config = server_config()
+
+    # For each of the secure headers supported by the `secure` library, we
+    # check if the corresponding configuration is set in the server
+    # configuration:
+    #
+    # - if set to `True`, we use the default value for the header
+    # - if set to a string, we use the string as the value for the header
+    # - if set to `False`, we don't set the header
+
+    server: Optional[secure.Server] = None
+    if config.secure_headers_server:
+        server = secure.Server()
+        if isinstance(config.secure_headers_server, str):
+            server.set(config.secure_headers_server)
+        else:
+            server.set(str(config.deployment_id))
+
+    hsts: Optional[secure.StrictTransportSecurity] = None
+    if config.secure_headers_hsts:
+        hsts = secure.StrictTransportSecurity()
+        if isinstance(config.secure_headers_hsts, str):
+            hsts.set(config.secure_headers_hsts)
+
+    xfo: Optional[secure.XFrameOptions] = None
+    if config.secure_headers_xfo:
+        xfo = secure.XFrameOptions()
+        if isinstance(config.secure_headers_xfo, str):
+            xfo.set(config.secure_headers_xfo)
+
+    xxp: Optional[secure.XXSSProtection] = None
+    if config.secure_headers_xxp:
+        xxp = secure.XXSSProtection()
+        if isinstance(config.secure_headers_xxp, str):
+            xxp.set(config.secure_headers_xxp)
+
+    csp: Optional[secure.ContentSecurityPolicy] = None
+    if config.secure_headers_csp:
+        csp = secure.ContentSecurityPolicy()
+        if isinstance(config.secure_headers_csp, str):
+            csp.set(config.secure_headers_csp)
+
+    content: Optional[secure.XContentTypeOptions] = None
+    if config.secure_headers_content:
+        content = secure.XContentTypeOptions()
+        if isinstance(config.secure_headers_content, str):
+            content.set(config.secure_headers_content)
+
+    referrer: Optional[secure.ReferrerPolicy] = None
+    if config.secure_headers_referrer:
+        referrer = secure.ReferrerPolicy()
+        if isinstance(config.secure_headers_referrer, str):
+            referrer.set(config.secure_headers_referrer)
+
+    cache: Optional[secure.CacheControl] = None
+    if config.secure_headers_cache:
+        cache = secure.CacheControl()
+        if isinstance(config.secure_headers_cache, str):
+            cache.set(config.secure_headers_cache)
+
+    permissions: Optional[secure.PermissionsPolicy] = None
+    if config.secure_headers_permissions:
+        permissions = secure.PermissionsPolicy()
+        if isinstance(config.secure_headers_permissions, str):
+            permissions.value = config.secure_headers_permissions
+
+    _secure_headers = secure.Secure(
+        server=server,
+        hsts=hsts,
+        xfo=xfo,
+        xxp=xxp,
+        csp=csp,
+        content=content,
+        referrer=referrer,
+        cache=cache,
+        permissions=permissions,
+    )

zenml/zen_server/template_execution/runner_entrypoint_configuration.py

@@ -19,7 +19,6 @@ from zenml.entrypoints.base_entrypoint_configuration import (
 )
 from zenml.new.pipelines.run_utils import (
     deploy_pipeline,
-    prepare_model_versions,
 )
 
 
@@ -37,5 +36,4 @@ class RunnerEntrypointConfiguration(BaseEntrypointConfiguration):
         stack = Client().active_stack
         assert deployment.stack and stack.id == deployment.stack.id
 
-        prepare_model_versions(deployment=deployment)
         deploy_pipeline(deployment=deployment, stack=stack)

zenml/zen_server/template_execution/utils.py

@@ -474,6 +474,7 @@ def deployment_request_from_template(
         build=deployment.build.id,
         schedule=None,
         code_reference=code_reference_request,
+        code_path=deployment.code_path,
         template=template.id,
         pipeline_version_hash=deployment.pipeline_version_hash,
         pipeline_spec=deployment.pipeline_spec,

zenml/zen_server/utils.py

@@ -29,7 +29,6 @@ from typing import (
 )
 from urllib.parse import urlparse
 
-import secure
 from pydantic import BaseModel, ValidationError
 
 from zenml.config.global_config import GlobalConfiguration
@@ -68,7 +67,6 @@ _rbac: Optional[RBACInterface] = None
 _feature_gate: Optional[FeatureGateInterface] = None
 _workload_manager: Optional[WorkloadManagerInterface] = None
 _plugin_flavor_registry: Optional[PluginFlavorRegistry] = None
-_secure_headers: Optional[secure.Secure] = None
 
 
 def zen_store() -> "SqlZenStore":
@@ -224,104 +222,6 @@ def initialize_zen_store() -> None:
     _zen_store = zen_store_
 
 
-def secure_headers() -> secure.Secure:
-    """Return the secure headers component.
-
-    Returns:
-        The secure headers component.
-
-    Raises:
-        RuntimeError: If the secure headers component is not initialized.
-    """
-    global _secure_headers
-    if _secure_headers is None:
-        raise RuntimeError("Secure headers component not initialized")
-    return _secure_headers
-
-
-def initialize_secure_headers() -> None:
-    """Initialize the secure headers component."""
-    global _secure_headers
-
-    config = server_config()
-
-    # For each of the secure headers supported by the `secure` library, we
-    # check if the corresponding configuration is set in the server
-    # configuration:
-    #
-    # - if set to `True`, we use the default value for the header
-    # - if set to a string, we use the string as the value for the header
-    # - if set to `False`, we don't set the header
-
-    server: Optional[secure.Server] = None
-    if config.secure_headers_server:
-        server = secure.Server()
-        if isinstance(config.secure_headers_server, str):
-            server.set(config.secure_headers_server)
-        else:
-            server.set(str(config.deployment_id))
-
-    hsts: Optional[secure.StrictTransportSecurity] = None
-    if config.secure_headers_hsts:
-        hsts = secure.StrictTransportSecurity()
-        if isinstance(config.secure_headers_hsts, str):
-            hsts.set(config.secure_headers_hsts)
-
-    xfo: Optional[secure.XFrameOptions] = None
-    if config.secure_headers_xfo:
-        xfo = secure.XFrameOptions()
-        if isinstance(config.secure_headers_xfo, str):
-            xfo.set(config.secure_headers_xfo)
-
-    xxp: Optional[secure.XXSSProtection] = None
-    if config.secure_headers_xxp:
-        xxp = secure.XXSSProtection()
-        if isinstance(config.secure_headers_xxp, str):
-            xxp.set(config.secure_headers_xxp)
-
-    csp: Optional[secure.ContentSecurityPolicy] = None
-    if config.secure_headers_csp:
-        csp = secure.ContentSecurityPolicy()
-        if isinstance(config.secure_headers_csp, str):
-            csp.set(config.secure_headers_csp)
-
-    content: Optional[secure.XContentTypeOptions] = None
-    if config.secure_headers_content:
-        content = secure.XContentTypeOptions()
-        if isinstance(config.secure_headers_content, str):
-            content.set(config.secure_headers_content)
-
-    referrer: Optional[secure.ReferrerPolicy] = None
-    if config.secure_headers_referrer:
-        referrer = secure.ReferrerPolicy()
-        if isinstance(config.secure_headers_referrer, str):
-            referrer.set(config.secure_headers_referrer)
-
-    cache: Optional[secure.CacheControl] = None
-    if config.secure_headers_cache:
-        cache = secure.CacheControl()
-        if isinstance(config.secure_headers_cache, str):
-            cache.set(config.secure_headers_cache)
-
-    permissions: Optional[secure.PermissionsPolicy] = None
-    if config.secure_headers_permissions:
-        permissions = secure.PermissionsPolicy()
-        if isinstance(config.secure_headers_permissions, str):
-            permissions.value = config.secure_headers_permissions
-
-    _secure_headers = secure.Secure(
-        server=server,
-        hsts=hsts,
-        xfo=xfo,
-        xxp=xxp,
-        csp=csp,
-        content=content,
-        referrer=referrer,
-        cache=cache,
-        permissions=permissions,
-    )
-
-
 _server_config: Optional[ServerConfiguration] = None
 
 

zenml/zen_server/zen_server_api.py

@@ -78,15 +78,17 @@ from zenml.zen_server.routers import (
     webhook_endpoints,
     workspaces_endpoints,
 )
+from zenml.zen_server.secure_headers import (
+    initialize_secure_headers,
+    secure_headers,
+)
 from zenml.zen_server.utils import (
     initialize_feature_gate,
     initialize_plugins,
     initialize_rbac,
-    initialize_secure_headers,
     initialize_workload_manager,
     initialize_zen_store,
     is_user_request,
-    secure_headers,
     server_config,
     zen_store,
 )

zenml/zen_stores/migrations/versions/0.65.0_release.py

@@ -0,0 +1,23 @@
+"""Release [0.65.0].
+
+Revision ID: 0.65.0
+Revises: bf2120261b5a
+Create Date: 2024-08-28 15:42:13.858104
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "0.65.0"
+down_revision = "bf2120261b5a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Upgrade database schema and/or data, creating a new revision."""
+    pass
+
+
+def downgrade() -> None:
+    """Downgrade database schema and/or data back to the previous revision."""
+    pass

zenml/zen_stores/migrations/versions/0.66.0_release.py

@@ -0,0 +1,23 @@
+"""Release [0.66.0].
+
+Revision ID: 0.66.0
+Revises: 0.65.0
+Create Date: 2024-09-09 14:12:13.152805
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "0.66.0"
+down_revision = "0.65.0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Upgrade database schema and/or data, creating a new revision."""
+    pass
+
+
+def downgrade() -> None:
+    """Downgrade database schema and/or data back to the previous revision."""
+    pass

zenml/zen_stores/migrations/versions/bf2120261b5a_add_configured_model_version_id.py

@@ -0,0 +1,74 @@
+"""add model_version_id [bf2120261b5a].
+
+Revision ID: bf2120261b5a
+Revises: 0.64.0
+Create Date: 2024-08-07 11:31:00.661089
+
+"""
+
+import sqlalchemy as sa
+import sqlmodel
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "bf2120261b5a"
+down_revision = "0.64.0"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """Upgrade database schema and/or data, creating a new revision."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("pipeline_run", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "model_version_id",
+                sqlmodel.sql.sqltypes.GUID(),
+                nullable=True,
+            )
+        )
+        batch_op.create_foreign_key(
+            "fk_pipeline_run_model_version_id_model_version",
+            "model_version",
+            ["model_version_id"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    with op.batch_alter_table("step_run", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "model_version_id",
+                sqlmodel.sql.sqltypes.GUID(),
+                nullable=True,
+            )
+        )
+        batch_op.create_foreign_key(
+            "fk_step_run_model_version_id_model_version",
+            "model_version",
+            ["model_version_id"],
+            ["id"],
+            ondelete="SET NULL",
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade database schema and/or data back to the previous revision."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("step_run", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "fk_step_run_model_version_id_model_version", type_="foreignkey"
+        )
+        batch_op.drop_column("model_version_id")
+
+    with op.batch_alter_table("pipeline_run", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            "fk_pipeline_run_model_version_id_model_version",
+            type_="foreignkey",
+        )
+        batch_op.drop_column("model_version_id")
+
+    # ### end Alembic commands ###

zenml/zen_stores/rest_zen_store.py

@@ -67,7 +67,6 @@ from zenml.constants import (
     ENV_ZENML_DISABLE_CLIENT_SERVER_MISMATCH_WARNING,
     EVENT_SOURCES,
     FLAVORS,
-    FULL_STACK,
     GET_OR_CREATE,
     INFO,
     LOGIN,
@@ -156,7 +155,6 @@ from zenml.models import (
     FlavorRequest,
     FlavorResponse,
     FlavorUpdate,
-    FullStackRequest,
     LogsResponse,
     ModelFilter,
     ModelRequest,
@@ -2832,27 +2830,12 @@ class RestZenStore(BaseZenStore):
         Returns:
             The registered stack.
         """
-        return self._create_workspace_scoped_resource(
-            resource=stack,
-            route=STACKS,
-            response_model=StackResponse,
-        )
-
-    def create_full_stack(self, full_stack: FullStackRequest) -> StackResponse:
-        """Register a full-stack.
-
-        Args:
-            full_stack: The full stack configuration.
-
-        Returns:
-            The registered stack.
-        """
-        assert full_stack.workspace is not None
+        assert stack.workspace is not None
 
         return self._create_resource(
-            resource=full_stack,
+            resource=stack,
             response_model=StackResponse,
-            route=f"{WORKSPACES}/{str(full_stack.workspace)}{FULL_STACK}",
+            route=f"{WORKSPACES}/{str(stack.workspace)}{STACKS}",
         )
 
     def get_stack(self, stack_id: UUID, hydrate: bool = True) -> StackResponse:
@@ -4108,7 +4091,7 @@ class RestZenStore(BaseZenStore):
                 f"{self.config.url}` should solve this issue. "
                 "If you're seeing this error from an automated workload, "
                 "you should probably use a service account to start that "
-                "workload to prevent this error."
+                "workload to prevent this error"
             )
 
     @staticmethod

zenml/zen_stores/schemas/constants.py

@@ -0,0 +1,16 @@
+#  Copyright (c) ZenML GmbH 2024. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at:
+#
+#       https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+"""Constant values needed by schema objects."""
+
+MODEL_VERSION_TABLENAME = "model_version"