Merge 0.68.1 release into develop (#3153)

* Remove unavailable upstream steps during cache precomputation (#3146) (cherry picked from commit d786f64) * Prepare release 0.68.1 (#3148) (cherry picked from commit 2a2c154)
zenml-io · Oct 28, 2024 · dec3b25 · dec3b25
1 parent 86155ae
commit dec3b25
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -327,7 +327,7 @@ the Apache License Version 2.0.
     <a href="https://github.com/zenml-io/zenml-projects">Projects Showcase</a>
     <br />
     <br />
-    🎉 Version 0.68.0 is out. Check out the release notes
+    🎉 Version 0.68.1 is out. Check out the release notes
     <a href="https://github.com/zenml-io/zenml/releases">here</a>.
     <br />
     🖥️ Download our VS Code Extension <a href="https://marketplace.visualstudio.com/items?itemName=ZenML.zenml-vscode">here</a>.

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,14 @@
 <!-- markdown-link-check-disable -->
 
+# 0.68.1
+
+Fixes an issue with some partially cached pipelines running on remote orchestrators.
+
+## What's Changed
+* Remove unavailable upstream steps during cache precomputation by @schustmi in https://github.com/zenml-io/zenml/pull/3146
+
+**Full Changelog**: https://github.com/zenml-io/zenml/compare/0.68.0...0.68.1
+
 # 0.68.0
 
 ## Highlights

diff --git a/examples/quickstart/configs/training_aws.yaml b/examples/quickstart/configs/training_aws.yaml
@@ -3,7 +3,7 @@ enable_cache: True
 # Environment configuration
 settings:
   docker:
-    parent_image: "715803424590.dkr.ecr.eu-central-1.amazonaws.com/zenml-public-pipelines:quickstart-0.68.0-py3.11-aws"
+    parent_image: "715803424590.dkr.ecr.eu-central-1.amazonaws.com/zenml-public-pipelines:quickstart-0.68.1-py3.11-aws"
     skip_build: True  # If you switch this to False remove the parent_image
     requirements: requirements.txt
   orchestrator.sagemaker:

diff --git a/examples/quickstart/configs/training_azure.yaml b/examples/quickstart/configs/training_azure.yaml
@@ -3,7 +3,7 @@ enable_cache: True
 # Environment configuration
 settings:
   docker:
-    parent_image: "zenmldocker/zenml-public-pipelines:quickstart-0.68.0-py3.11-azure"
+    parent_image: "zenmldocker/zenml-public-pipelines:quickstart-0.68.1-py3.11-azure"
     skip_build: True
     requirements: requirements.txt
   # Uncomment the following lines to specify the accelerator for your azureml orchestrator

diff --git a/examples/quickstart/configs/training_gcp.yaml b/examples/quickstart/configs/training_gcp.yaml
@@ -3,7 +3,7 @@ enable_cache: True
 # Environment configuration
 settings:
   docker:
-    parent_image: "zenmldocker/zenml-public-pipelines:quickstart-0.68.0-py3.11-gcp"
+    parent_image: "zenmldocker/zenml-public-pipelines:quickstart-0.68.1-py3.11-gcp"
     skip_build: True
     requirements: requirements.txt
 # Uncomment the following two lines to specify the accelerator for your vertex orchestrator

diff --git a/examples/quickstart/quickstart.ipynb b/examples/quickstart/quickstart.ipynb
@@ -494,7 +494,7 @@
         "# Common imports and setup\n",
         "if CLOUD_PROVIDER.lower() == \"gcp\":\n",
         "    parent_image = (\n",
-        "        \"zenmldocker/zenml-public-pipelines:quickstart-0.68.0-py3.11-gcp\"\n",
+        "        \"zenmldocker/zenml-public-pipelines:quickstart-0.68.1-py3.11-gcp\"\n",
         "    )\n",
         "    skip_build = True\n",
         "\n",
@@ -503,7 +503,7 @@
         "        SagemakerOrchestratorSettings,\n",
         "    )\n",
         "\n",
-        "    parent_image = \"339712793861.dkr.ecr.eu-central-1.amazonaws.com/zenml-public-pipelines:quickstart-0.68.0-py3.11-aws\"\n",
+        "    parent_image = \"339712793861.dkr.ecr.eu-central-1.amazonaws.com/zenml-public-pipelines:quickstart-0.68.1-py3.11-aws\"\n",
         "    skip_build = True  # if you switch this to False, you need to remove the parent image\n",
         "\n",
         "    settings[\"orchestrator.sagemaker\"] = SagemakerOrchestratorSettings(\n",
@@ -512,7 +512,7 @@
         "\n",
         "elif CLOUD_PROVIDER.lower() == \"azure\":\n",
         "    parent_image = (\n",
-        "        \"zenmldocker/zenml-public-pipelines:quickstart-0.68.0-py3.11-azure\"\n",
+        "        \"zenmldocker/zenml-public-pipelines:quickstart-0.68.1-py3.11-azure\"\n",
         "    )\n",
         "    skip_build = True\n",
         "\n",

diff --git a/examples/quickstart/requirements.txt b/examples/quickstart/requirements.txt
@@ -1,4 +1,4 @@
-zenml[server]==0.68.0
+zenml[server]==0.68.1
 notebook
 pyarrow
 datasets

diff --git a/examples/quickstart/requirements_aws.txt b/examples/quickstart/requirements_aws.txt
@@ -1,4 +1,4 @@
-zenml[server]==0.68.0
+zenml[server]==0.68.1
 notebook
 pyarrow
 datasets

diff --git a/examples/quickstart/requirements_azure.txt b/examples/quickstart/requirements_azure.txt
@@ -1,4 +1,4 @@
-zenml[server]==0.68.0
+zenml[server]==0.68.1
 notebook
 pyarrow
 datasets

diff --git a/examples/quickstart/requirements_gcp.txt b/examples/quickstart/requirements_gcp.txt
@@ -1,4 +1,4 @@
-zenml[server]==0.68.0
+zenml[server]==0.68.1
 notebook
 pyarrow
 datasets

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zenml"
-version = "0.68.0"
+version = "0.68.1"
 packages = [{ include = "zenml", from = "src" }]
 description = "ZenML: Write production-ready ML code."
 authors = ["ZenML GmbH <[email protected]>"]

diff --git a/src/zenml/VERSION b/src/zenml/VERSION
@@ -1 +1 @@
-0.68.0
+0.68.1
diff --git a/src/zenml/orchestrators/base_orchestrator.py b/src/zenml/orchestrators/base_orchestrator.py
@@ -211,6 +211,11 @@ def run(
                 # the orchestrator does not try to run them
                 deployment.step_configurations.pop(invocation_id)
 
+            for step in deployment.step_configurations.values():
+                for invocation_id in cached_invocations:
+                    if invocation_id in step.spec.upstream_steps:
+                        step.spec.upstream_steps.remove(invocation_id)
+
             if len(deployment.step_configurations) == 0:
                 # All steps were cached, we update the pipeline run status and
                 # don't actually use the orchestrator to run the pipeline

diff --git a/src/zenml/zen_server/deploy/helm/Chart.yaml b/src/zenml/zen_server/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: zenml
-version: "0.68.0"
+version: "0.68.1"
 description: Open source MLOps framework for portable production ready ML pipelines
 keywords:
 - mlops

diff --git a/src/zenml/zen_server/deploy/helm/README.md b/src/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.68.0
-helm install my-zenml oci://public.ecr.aws/zenml/zenml --version 0.68.0
+# example command for version 0.68.1
+helm install my-zenml oci://public.ecr.aws/zenml/zenml --version 0.68.1
 ```
 
 Note: Ensure you have OCI support enabled in your Helm client and that you are authenticated with Amazon ECR.

diff --git a/src/zenml/zen_stores/migrations/versions/0.68.1_release.py b/src/zenml/zen_stores/migrations/versions/0.68.1_release.py
@@ -0,0 +1,23 @@
+"""Release [0.68.1].
+
+Revision ID: 0.68.1
+Revises: 0.68.0
+Create Date: 2024-10-28 10:34:17.307663
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "0.68.1"
+down_revision = "0.68.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