[backport/0.43] Backport important patches (#2061)

stefannica · strickvl · fa9r · web-flow · commit 213f870839ad · 2023-12-18T09:40:29.000+01:00
* Remove latest from released artifacts * hard pin SQLModel * limit openai dependency to <1.0.0 (#2027) * Fix user activation * Prepare release 0.43.1 * Fix linter errors * Fix PyYAML and linter errors * Fix llama_index mypy errors * Remove failing langchain and llama_index unit tests --------- Co-authored-by: Alex Strick van Linschoten <stricksubscriptions@fastmail.fm> Co-authored-by: Alex Strick van Linschoten <strickvl@users.noreply.github.com> Co-authored-by: Felix Altenberger <felix@zenml.io>
diff --git a/.github/workflows/publish_api_docs.yml b/.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 }}
diff --git a/.github/workflows/publish_to_pypi.yml b/.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:
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@
     <br />
     <b>ZenML Cloud</b> is now available in beta. <a href="https://cloud.zenml.io">Sign up</a> to see it in action.  
     <br />
-    🎉 Version 0.43.0 is out. Check out the release notes
+    🎉 Version 0.43.1 is out. Check out the release notes
     <a href="https://github.com/zenml-io/zenml/releases">here</a>.
     <br />
     <a href="https://www.linkedin.com/company/zenml/">
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,12 @@
 <!-- markdown-link-check-disable -->
 
+# 0.43.1
+
+Backports some important fixes that have been introduced in more recent versions
+of ZenML to the 0.43.x release line.
+
+**Full Changelog**: https://github.com/zenml-io/zenml/compare/0.43.0...0.43.1
+
 # 0.43.0
 
 This release brings limited support for Python 3.11, 
diff --git a/docs/book/toc.md b/docs/book/toc.md
@@ -158,7 +158,7 @@
 
 ## Reference
 
-* [🤷 SDK & CLI reference](https://sdkdocs.zenml.io/0.43.0/)
+* [🤷 SDK & CLI reference](https://sdkdocs.zenml.io/0.43.1/)
 * [🤷 Server API reference](https://demoserver.zenml.io/docs)
 * [♻ Migration guide](reference/migration-guide/migration-guide.md)
   * [Migration guide 0.13.2 → 0.20.0](reference/migration-guide/migration-zero-twenty.md)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zenml"
-version = "0.43.0"
+version = "0.43.1"
 packages = [
     { include = "zenml", from = "src" },
 ]
@@ -70,7 +70,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 }
@@ -349,6 +349,7 @@ module = [
     "datasets.*",
     "pyngrok.*",
     "cloudpickle.*",
+    "matplotlib.*",
 ]
 ignore_missing_imports = true
 
diff --git a/release-cloudbuild.yaml b/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
@@ -78,11 +62,6 @@ steps:
           --target base \
           -f docker/base.Dockerfile . \
           -t $$USERNAME/zenml:$TAG_NAME-py3.11
-
-        # 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.11 $$USERNAME/zenml:py3.11
-        fi
     id: build-base-3.11
     waitFor: ['-']
     entrypoint: bash
@@ -99,11 +78,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
diff --git a/scripts/install-zenml-dev.sh b/scripts/install-zenml-dev.sh
@@ -48,11 +48,16 @@ install_integrations() {
     zenml integration export-requirements \
         --output-file integration-requirements.txt \
         $ignore_integrations_args
+
+    # 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
 
-    # install langchain and llama_index integrations separately
-    zenml integration install -y langchain llama_index
+    # install langchain separately
+    zenml integration install -y langchain
 }
 
 
diff --git a/src/zenml/VERSION b/src/zenml/VERSION
@@ -1 +1 @@
-0.43.0
+0.43.1
diff --git a/src/zenml/integrations/langchain/__init__.py b/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:
diff --git a/src/zenml/integrations/llama_index/materializers/document_materializer.py b/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):
diff --git a/src/zenml/integrations/llama_index/materializers/gpt_index_materializer.py b/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])
 
diff --git a/src/zenml/integrations/openai/__init__.py b/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()
diff --git a/src/zenml/integrations/openai/hooks/open_ai_failure_hook.py b/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=[
                 {
diff --git a/src/zenml/materializers/numpy_materializer.py b/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)
diff --git a/src/zenml/zen_server/auth.py b/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
 
diff --git a/src/zenml/zen_server/deploy/helm/Chart.yaml b/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.43.0"
+appVersion: "0.43.1"
diff --git a/tests/unit/integrations/langchain/materializers/test_openai_embedding_materializer_materializer.py b/tests/unit/integrations/langchain/materializers/test_openai_embedding_materializer_materializer.py
diff --git a/tests/unit/integrations/llama_index/__init__.py b/tests/unit/integrations/llama_index/__init__.py
diff --git a/tests/unit/integrations/llama_index/materializers/__init__.py b/tests/unit/integrations/llama_index/materializers/__init__.py
diff --git a/tests/unit/integrations/llama_index/materializers/test_llama_index_document_materializer.py b/tests/unit/integrations/llama_index/materializers/test_llama_index_document_materializer.py
