[backport/0.42] Backport important patches

.github/actions/setup_environment/action.yml

@@ -74,14 +74,19 @@ runs:
       shell: bash
       run: |
         zenml integration export-requirements --output-file integration-requirements.txt --ignore-integration feast --ignore-integration label_studio --ignore-integration bentoml --ignore-integration seldon --ignore-integration kserve --ignore-integration langchain --ignore-integration llama_index --ignore-integration pycaret
+        # pin pyyaml>=6.0.1
+        echo "" >> integration-requirements.txt
+        echo "pyyaml>=6.0.1" >> integration-requirements.txt
         pip install -r integration-requirements.txt
         rm integration-requirements.txt
 
-    - name: Install langchain and llama_index integrations
+
+
+    - name: Install langchain integration
       if: steps.cache-virtualenv.outputs.cache-hit != 'true' && inputs.install_integrations == 'yes'
       shell: bash
       run: |
-        zenml integration install -y langchain llama_index
+        zenml integration install -y langchain
 
       # Refresh the ZenML installation if using a cached virtualenv or after
       # installing integrations

.github/workflows/publish_api_docs.yml

@@ -51,4 +51,4 @@ jobs:
 
       - name: Runs docs generation
         run: |
-          bash scripts/generate-docs.sh -s src/zenml/ --push --latest -v ${{ steps.get_version.outputs.VERSION }}
+          bash scripts/generate-docs.sh -s src/zenml/ --push -v ${{ steps.get_version.outputs.VERSION }}

.github/workflows/publish_to_pypi.yml

@@ -31,7 +31,10 @@ jobs:
           virtualenvs-in-project: true
 
       - name: Include latest dashboard
-        run: bash scripts/install-dashboard.sh
+        shell: bash
+        env:
+          TAG: v0.9.0
+        run: scripts/install-dashboard.sh
 
       - name: publish
         env:

README.md

@@ -89,7 +89,7 @@
     ·
     <a href="#-meet-the-team">Meet the Team</a>
     <br />
-    🎉 Version 0.42.1 is out. Check out the release notes
+    🎉 Version 0.42.2 is out. Check out the release notes
     <a href="https://github.com/zenml-io/zenml/releases">here</a>.
     <br />
     <br />

RELEASE_NOTES.md

@@ -1,4 +1,10 @@
 <!-- markdown-link-check-disable -->
+# 0.42.2
+
+Backports some important fixes that have been introduced in more recent versions
+of ZenML to the 0.42.x release line.
+
+**Full Changelog**: https://github.com/zenml-io/zenml/compare/0.42.1...0.42.2
 
 # 0.42.1
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zenml"
-version = "0.42.1"
+version = "0.42.2"
 packages = [
     { include = "zenml", from = "src" },
 ]
@@ -69,7 +69,7 @@ python-terraform = { version = "^0.10.1" }
 pyyaml = ">=6.0.1"
 rich = {extras = ["jupyter"], version = "^12.0.0"}
 sqlalchemy_utils = "0.38.3"
-sqlmodel = "~0.0.8"
+sqlmodel = "0.0.8"
 
 # Optional dependencies for the ZenServer
 fastapi = { version = ">=0.75,<0.100", optional = true }
@@ -345,6 +345,7 @@ module = [
     "datasets.*",
     "pyngrok.*",
     "cloudpickle.*",
+    "matplotlib.*",
 ]
 ignore_missing_imports = true
 

release-cloudbuild.yaml

@@ -11,12 +11,6 @@ steps:
           -f docker/base.Dockerfile . \
           -t $$USERNAME/zenml:$TAG_NAME-py3.8 \
           -t $$USERNAME/zenml:$TAG_NAME
-
-        # use latest tags only for official releases
-        if [[ $TAG_NAME =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
-          docker tag $$USERNAME/zenml:$TAG_NAME-py3.8 $$USERNAME/zenml:py3.8
-          docker tag $$USERNAME/zenml:$TAG_NAME-py3.8 $$USERNAME/zenml:latest
-        fi
     id: build-base-3.8
     waitFor: ['-']
     entrypoint: bash
@@ -34,11 +28,6 @@ steps:
           --target base \
           -f docker/base.Dockerfile . \
           -t $$USERNAME/zenml:$TAG_NAME-py3.9
-
-        # use latest tags only for official releases
-        if [[ $TAG_NAME =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
-          docker tag $$USERNAME/zenml:$TAG_NAME-py3.9 $$USERNAME/zenml:py3.9
-        fi
     id: build-base-3.9
     waitFor: ['-']
     entrypoint: bash
@@ -56,11 +45,6 @@ steps:
           --target base \
           -f docker/base.Dockerfile . \
           -t $$USERNAME/zenml:$TAG_NAME-py3.10
-
-        # use latest tags only for official releases
-        if [[ $TAG_NAME =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
-          docker tag $$USERNAME/zenml:$TAG_NAME-py3.10 $$USERNAME/zenml:py3.10
-        fi
     id: build-base-3.10
     waitFor: ['-']
     entrypoint: bash
@@ -77,11 +61,6 @@ steps:
         --build-arg PYTHON_VERSION=3.8 \
         -f docker/base.Dockerfile . \
         -t $$USERNAME/zenml-server:$TAG_NAME
-
-        # use latest tags only for official releases
-        if [[ $TAG_NAME =~ ^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$ ]]; then
-          docker tag $$USERNAME/zenml-server:$TAG_NAME $$USERNAME/zenml-server:latest
-        fi         
     id: build-server
     waitFor: ['-']
     entrypoint: bash

src/zenml/VERSION

@@ -1 +1 @@
-0.42.1
+0.42.2

src/zenml/integrations/deepchecks/__init__.py

@@ -37,8 +37,10 @@ class DeepchecksIntegration(Integration):
     NAME = DEEPCHECKS
     REQUIREMENTS = [
         "deepchecks[vision]==0.8.0",
-        "torchvision==0.14.0",
+        "torchvision>=0.14.0",
         "pandas<2.0.0",
+        "opencv-python==4.5.5.64",  # pin to same version
+        "opencv-python-headless==4.5.5.64",  # pin to same version
     ]
     APT_PACKAGES = ["ffmpeg", "libsm6", "libxext6"]
 

src/zenml/integrations/langchain/__init__.py

@@ -25,7 +25,7 @@ class LangchainIntegration(Integration):
     """Definition of langchain integration for ZenML."""
 
     NAME = LANGCHAIN
-    REQUIREMENTS = ["langchain>=0.0.116"]
+    REQUIREMENTS = ["langchain>=0.0.116", "pyyaml>=6.0.1"]
 
     @classmethod
     def activate(cls) -> None:

src/zenml/integrations/llama_index/materializers/document_materializer.py

@@ -30,7 +30,9 @@
     LCDocument = Any
 else:
     from langchain.docstore.document import Document as LCDocument
-    from llama_index.readers.schema.base import Document
+    from llama_index.readers.schema.base import (  # type: ignore[import]
+        Document,
+    )
 
 
 class LlamaIndexDocumentMaterializer(LangchainDocumentMaterializer):

src/zenml/integrations/llama_index/materializers/gpt_index_materializer.py

@@ -39,8 +39,12 @@
     GPTFaissIndex = Any
     T = TypeVar("T", bound=Any)
 else:
-    from llama_index.indices.base import BaseGPTIndex
-    from llama_index.indices.vector_store import GPTFaissIndex
+    from llama_index.indices.base import (  # type: ignore[import]
+        BaseGPTIndex,
+    )
+    from llama_index.indices.vector_store import (  # type: ignore[import]
+        GPTFaissIndex,
+    )
 
     T = TypeVar("T", bound=BaseGPTIndex[Any])
 

src/zenml/integrations/openai/__init__.py

@@ -21,7 +21,7 @@ class OpenAIIntegration(Integration):
     """Definition of OpenAI integration for ZenML."""
 
     NAME = OPEN_AI
-    REQUIREMENTS = ["openai>=0.27.0"]
+    REQUIREMENTS = ["openai>=0.27.0,<1.0.0"]
 
 
 OpenAIIntegration.check_installation()

src/zenml/integrations/openai/hooks/open_ai_failure_hook.py

@@ -62,7 +62,7 @@ def openai_alerter_failure_hook_helper(
         sys.stdout = original_stdout
         rich_traceback = output_captured.getvalue()
 
-        response = openai.ChatCompletion.create(  # type: ignore[no-untyped-call]
+        response = openai.ChatCompletion.create(  # type: ignore
             model=model_name,
             messages=[
                 {

src/zenml/materializers/numpy_materializer.py

@@ -151,7 +151,7 @@ def _save_histogram(self, output_path: str, arr: "NDArray[Any]") -> None:
             output_path: The path to save the histogram to.
             arr: The numpy array of which to save the histogram.
         """
-        import matplotlib.pyplot as plt  # type: ignore
+        import matplotlib.pyplot as plt
 
         plt.hist(arr)
         with fileio.open(output_path, "wb") as f:
@@ -183,7 +183,7 @@ def _save_image(self, output_path: str, arr: "NDArray[Any]") -> None:
             output_path: The path to save the image to.
             arr: The numpy array to save.
         """
-        from matplotlib.image import imsave  # type: ignore
+        from matplotlib.image import imsave
 
         with fileio.open(output_path, "wb") as f:
             imsave(f, arr)

src/zenml/zen_server/auth.py

@@ -165,6 +165,9 @@ def authenticate_credentials(
     elif activation_token is not None:
         if not UserAuthModel.verify_activation_token(activation_token, user):
             return None
+    else:
+        if authentication_scheme() != AuthScheme.NO_AUTH:
+            return None
 
     return auth_context
 

src/zenml/zen_server/deploy/helm/Chart.yaml

@@ -10,4 +10,4 @@ home: https://zenml.io
 sources:
 - https://github.com/zenml-io/zenml
 icon: https://raw.githubusercontent.com/zenml-io/zenml/main/docs/book/.gitbook/assets/zenml_logo.png
-appVersion: "0.42.1"
+appVersion: "0.42.2"