Merge branch 'main' into autoreview_readme

* error resolved

* ran linter

* andrew comments resolved

* ran linter

Co-authored-by: Andrew Ferlitsch <aferlitsch@google.com>

.cloud-build/execute_changed_notebooks_helper.py

@@ -17,13 +17,16 @@ import concurrent
 import dataclasses
 import datetime
 import functools
+import json
 import git
 import operator
 import os
 import pathlib
 import re
 import subprocess
+import utils
 from typing import List, Optional
+from utils import util
 
 import execute_notebook_helper
 import execute_notebook_remote
@@ -35,6 +38,7 @@ from utils import NotebookProcessors, util
 
 # A buffer so that workers finish before the orchestrating job
 WORKER_TIMEOUT_BUFFER_IN_SECONDS: int = 60 * 60
+PYTHON_VERSION = "3.9" # Set default python version
 
 
 def format_timedelta(delta: datetime.timedelta) -> str:
@@ -66,6 +70,7 @@ class NotebookExecutionResult:
     log_url: str
     output_uri: str
     build_id: str
+    logs_bucket: str
     error_message: Optional[str]
 
     @property
@@ -110,6 +115,33 @@ def _process_notebook(
         nbformat.write(nb, new_file)
 
 
+def _get_notebook_python_version(notebook_path: str) -> str:
+    """
+    Get the python version for running the notebook if it is specified in
+    the notebook.
+    """
+    python_version = PYTHON_VERSION
+
+    # Load the notebook
+    file = open(notebook_path)
+    src = file.read()
+    nb_json = json.loads(src)
+
+    #Iterate over the cells in the ipynb
+    for cell in nb_json['cells']:
+        if cell['cell_type'] == 'markdown':
+            markdown = str.join('', cell['source'])
+
+            # Look for the python version specification pattern
+            re_match = re.search('python version = (\d\.\d)', markdown, flags=re.IGNORECASE)
+            if re_match:
+                # get the version number
+                python_version = re_match.group(1)
+                break
+
+    return python_version
+
+
 def _create_tag(filepath: str) -> str:
     tag = os.path.basename(os.path.normpath(filepath))
     tag = re.sub("[^0-9a-zA-Z_.-]+", "-", tag)
@@ -160,6 +192,7 @@ def process_and_execute_notebook(
         output_uri=notebook_output_uri,
         log_url="",
         build_id="",
+        logs_bucket="",
         error_message=None,
     )
 
@@ -167,6 +200,10 @@ def process_and_execute_notebook(
     time_start = datetime.datetime.now()
     operation = None
     try:
+        # Get the python version for running the notebook if specified
+        notebook_exec_python_version = _get_notebook_python_version(notebook_path=notebook)
+        print(f"Running notebook with python {notebook_exec_python_version}")
+
         # Pre-process notebook by substituting variable names
         _process_notebook(
             notebook_path=notebook,
@@ -193,11 +230,13 @@ def process_and_execute_notebook(
             private_pool_id=private_pool_id,
             private_pool_region=variable_region,
             timeout_in_seconds=timeout_in_seconds,
+            python_version=notebook_exec_python_version
         )
 
         operation_metadata = BuildOperationMetadata(mapping=operation.metadata)
         result.build_id = operation_metadata.build.id
         result.log_url = operation_metadata.build.log_url
+        result.logs_bucket = operation_metadata.build.logs_bucket
 
         # Block and wait for the result
         operation_result = operation.result()
@@ -339,7 +378,7 @@ def process_and_execute_notebooks(
         seconds=max(timeout - WORKER_TIMEOUT_BUFFER_IN_SECONDS, 0)
     )
 
-    if len(notebooks) > 1:
+    if len(notebooks) >= 1:
         notebook_execution_results: List[NotebookExecutionResult] = []
 
         print(f"Found {len(notebooks)} modified notebooks: {notebooks}")
@@ -404,6 +443,7 @@ def process_and_execute_notebooks(
                         result.log_url,
                         result.output_uri,
                         result.output_uri_web,
+                        result.logs_bucket
                     ]
                     for result in results_sorted
                 ],
@@ -414,10 +454,35 @@ def process_and_execute_notebooks(
                     "log_url",
                     "output_uri",
                     "output_uri_web",
+                    "logs_bucket"
                 ],
             )
         )
 
+        if len(notebooks) == 1:
+          print("="*100)
+          print("The notebook execution build log:\n")
+          print("="*100)
+
+          build_id = results_sorted[0].build_id
+          logs_bucket_name = (results_sorted[0].logs_bucket).removeprefix("gs://")
+          log_file_name = f"log-{build_id}.txt"
+
+          log_contents = util.download_blob_into_memory(
+            bucket_name=logs_bucket_name,
+            blob_name=log_file_name,
+            download_as_text=True
+            )
+
+          # Remove extra steps from the log
+          match = re.search("starting Step #4", log_contents, flags=re.IGNORECASE)
+
+          if match is not None:
+            match_index = match.span()[0]
+            print(log_contents[match_index:])
+          else:
+            print(log_contents)
+
         print("\n=== END RESULTS===\n")
 
         total_notebook_duration = functools.reduce(
@@ -433,25 +498,5 @@ def process_and_execute_notebooks(
         # Raise error if any notebooks failed
         if not all([result.is_pass for result in results_sorted]):
             raise RuntimeError("Notebook failures detected. See logs for details")
-
-    elif len(notebooks) == 1:
-        notebook = notebooks[0]
-
-        # Pre-process notebook by substituting variable names
-        _process_notebook(
-            notebook_path=notebook,
-            variable_project_id=variable_project_id,
-            variable_region=variable_region,
-            variable_service_account=variable_service_account,
-            variable_vpc_network=variable_vpc_network,
-        )
-
-        execute_notebook_helper.execute_notebook(
-            notebook_source=notebook,
-            output_file_or_uri="/".join(
-                [artifacts_bucket, pathlib.Path(notebook).name]
-            ),
-            should_log_output=True,
-        )
     else:
         print("No notebooks modified in this pull request.")

.cloud-build/execute_notebook_helper.py

@@ -26,6 +26,9 @@ from utils import util
 
 # This script is used to execute a notebook and write out the output notebook.
 
+# This is used to force papermill to use this kernel to run the notebook instead of any defined inside the notebook itself
+DEFAULT_KERNEL_NAME = "python3"
+
 
 def execute_notebook(
     notebook_source: str,
@@ -50,14 +53,11 @@ def execute_notebook(
 
     execution_exception = None
 
-
     print("\n=== DOWNLOAD EXECUTED NOTEBOOK ===\n")
-    print(
-                f"Please debug the executed notebook by downloading the executed notebook:"
-            )
+    print(f"Please debug the executed notebook by downloading the executed notebook:")
 
     print("Option 1. Using gsutil. Run the following command in your terminal.")
-    print(f"\tgsutil cp \"{output_file_or_uri}\" .")
+    print(f'\tgsutil cp "{output_file_or_uri}" .')
 
     print("Option 2. Using this link.")
     print(f"\thttps://storage.googleapis.com/{output_file_or_uri[5:]}")
@@ -72,6 +72,7 @@ def execute_notebook(
             output_path=notebook_source,
             progress_bar=should_log_output,
             request_save_on_cell_execute=should_log_output,
+            kernel_name=DEFAULT_KERNEL_NAME,
             log_output=should_log_output,
             stdout_file=sys.stdout if should_log_output else None,
             stderr_file=sys.stderr if should_log_output else None,

.cloud-build/execute_notebook_remote.py

@@ -40,6 +40,7 @@ def execute_notebook_remote(
     private_pool_region: Optional[str],
     tag: Optional[str],
     timeout_in_seconds: Optional[int] = None,
+    python_version: Optional[str] = None
 ) -> operation.Operation:
     """Create and execute a single notebook on Google Cloud Build"""
     # Load build steps from YAML
@@ -50,8 +51,12 @@ def execute_notebook_remote(
         "_PYTHON_IMAGE": container_uri,
         "_NOTEBOOK_GCS_URI": notebook_uri,
         "_NOTEBOOK_OUTPUT_GCS_URI": notebook_output_uri,
+        "_PYTHON_VERSION" : f"python{python_version}"
     }
 
+    if python_version is not None:
+      substitutions["_PYTHON_VERSION"] = "python" + python_version
+
     build = cloudbuild_v1.Build()
 
     options: Optional[client_options.ClientOptions] = None

.cloud-build/notebook-execution-test-cloudbuild-single.yaml

@@ -10,21 +10,21 @@ steps:
     entrypoint: /bin/sh
     args:
     - -c
-    - python3 .cloud-build/CheckPythonVersion.py -q
+    - ${_PYTHON_VERSION} .cloud-build/CheckPythonVersion.py -q
   # Create a virtual environment
   - name: ${_PYTHON_IMAGE}
     entrypoint: /bin/sh
     args:
     - -c
-    - python3 -m venv workspace/env
+    - ${_PYTHON_VERSION} -m venv workspace/env
   # Install Python dependencies
   - name: ${_PYTHON_IMAGE}
     entrypoint: /bin/sh
     args:
     - -c
     - . workspace/env/bin/activate &&
-      python3 -m pip -q install -U pip &&
-      python3 -m pip -q install -U -r .cloud-build/requirements.txt
+      python -m pip -q install -U pip &&
+      python -m pip -q install -U -r .cloud-build/requirements.txt
   # Install Python dependencies and run testing script
   - name: ${_PYTHON_IMAGE}
     entrypoint: /bin/sh
@@ -32,7 +32,7 @@ steps:
     - -c
     - |
       . workspace/env/bin/activate &&
-      python3 .cloud-build/execute_notebook_cli.py --notebook_source "${_NOTEBOOK_GCS_URI}" --output_file_or_uri "${_NOTEBOOK_OUTPUT_GCS_URI}"
+      python .cloud-build/execute_notebook_cli.py --notebook_source "${_NOTEBOOK_GCS_URI}" --output_file_or_uri "${_NOTEBOOK_OUTPUT_GCS_URI}"
     env:
     - 'IS_TESTING=1'
 timeout: 86400s

.cloud-build/test_notebook_vm.txt

@@ -1,5 +1,6 @@
 notebooks/official/vizier/gapic-vizier-multi-objective-optimization.ipynb
 notebooks/official/pipelines/lightweight_functions_component_io_kfp.ipynb
 notebooks/official/ml_metadata/sdk-metric-parameter-tracking-for-locally-trained-models.ipynb
-notebooks/official/pipelines/metrics_viz_run_compare_kfp.ipynb
-notebooks/official/matching_engine/sdk_matching_engine_for_indexing.ipynb
+notebooks/official/custom/custom-tabular-bq-managed-dataset.ipynb
+notebooks/official/matching_engine/sdk_matching_engine_for_indexing.ipynb
+.cloud-build/tests/python_version_test.ipynb

.cloud-build/test_single_notebook_vm.txt

@@ -1 +1 @@
-notebooks/official/pipelines/metrics_viz_run_compare_kfp.ipynb
+notebooks/official/custom/custom-tabular-bq-managed-dataset.ipynb

.cloud-build/tests/python_version_test.ipynb

@@ -0,0 +1,61 @@
+{
+  "cells": [
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "57a3d44ed8a8"
+      },
+      "source": [
+        "### Set up your Google Cloud project\n",
+        "\n",
+        "**_NOTE_**: This notebook has been tested in the following environment:\n",
+        "\n",
+        "* Python version = 3.7\n",
+        "\n",
+        "**The following steps are required, regardless of your notebook environment.**\n",
+        "\n",
+        "1. [Select or create a Google Cloud project](https://console.cloud.google.com/cloud-resource-manager). When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
+        "\n",
+        "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
+        "\n",
+        "1. [Enable the Vertex AI API and Compute Engine API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component).\n",
+        "\n",
+        "1. If you are running this notebook locally, you will need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
+        "\n",
+        "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
+        "Cloud SDK uses the right project for all the commands in this notebook.\n",
+        "\n",
+        "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$` into these commands."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "c6516f90311b"
+      },
+      "outputs": [],
+      "source": [
+        "# test if the right python version is being used\n",
+        "import sys\n",
+        "\n",
+        "actual_python_version = f\"{sys.version_info.major}.{sys.version_info.minor}\"\n",
+        "print(f\"Runtime python version: {actual_python_version}\")\n",
+        "\n",
+        "assert actual_python_version == \"3.7\", \"Wrong python version!\""
+      ]
+    }
+  ],
+  "metadata": {
+    "colab": {
+      "name": "python_version_test.ipynb",
+      "toc_visible": true
+    },
+    "kernelspec": {
+      "display_name": "Python 3",
+      "name": "python3"
+    }
+  },
+  "nbformat": 4,
+  "nbformat_minor": 0
+}

.cloud-build/utils/util.py

@@ -3,7 +3,7 @@ import subprocess
 import tarfile
 import uuid
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Union
 
 from google.auth import credentials as auth_credentials
 from google.cloud import storage
@@ -58,3 +58,34 @@ def archive_code_and_upload(staging_bucket: str):
     print(f"Uploaded source code archive to {source_archived_file_gcs}")
 
     return source_archived_file_gcs
+
+
+def download_blob_into_memory(
+  bucket_name: str,
+  blob_name: str,
+  download_as_text: Optional[bool]=False
+) -> Union[bytes, str]:
+    """
+    Downloads a blob into memory as byte or as text if
+    download_as_text is set to True.
+    """
+
+    storage_client = storage.Client()
+
+    bucket = storage_client.bucket(bucket_name)
+
+    # Construct a client side representation of a blob.
+    blob = bucket.blob(blob_name)
+
+    # Download the blob content
+    if download_as_text:
+      contents = blob.download_as_text()
+    else:
+      contents = blob.download_as_bytes()
+
+    print(
+        f"Downloaded storage object {blob_name} from bucket {bucket_name}."
+    )
+
+    return contents
+

.github/workflows/linter/Dockerfile

@@ -0,0 +1,20 @@
+# To use this image, run this command with the desired notebook args from the top-level vertex-ai-samples directory:
+# 1. To lint all changed notebooks:
+# docker run -v ${PWD}:/setup/app gcr.io/python-docs-samples-tests/notebook_linter:latest
+# 2. To lint specific notebooks:
+# docker run -v ${PWD}:/setup/app gcr.io/python-docs-samples-tests/notebook_linter:latest notebooks/1.ipynb notebooks/2.ipynb
+
+FROM python:3.10
+
+WORKDIR setup
+
+COPY ./requirements.txt .
+COPY ./run_linter.sh .
+
+# Install dependencies.
+RUN pip install --upgrade pip
+RUN pip install -r requirements.txt
+
+WORKDIR app
+
+ENTRYPOINT ["/setup/run_linter.sh"]

.github/workflows/linter/run_linter.sh

@@ -47,12 +47,22 @@ done
 
 echo "Test mode: $is_test"
 
+# Read in user-provided notebooks
+notebooks=()
+for arg in "$@"; do
+    if [[ $arg == *.ipynb ]]; then
+        notebooks+=("$arg")
+    fi
+done
+
 # Only check notebooks in test folders modified in this pull request.
 # Note: Use process substitution to persist the data in the array
-notebooks=()
-while read -r file || [ -n "$line" ]; do
-    notebooks+=("$file")
-done < <(git diff --name-only main... | grep '\.ipynb$')
+if [ ${#notebooks[@]} -eq 0 ]; then
+    echo "Checking for changed notebooked using git"
+    while read -r file || [ -n "$line" ]; do
+        notebooks+=("$file")
+    done < <(git diff --name-only main... | grep '\.ipynb$')
+fi
 
 problematic_notebooks=()
 if [ ${#notebooks[@]} -gt 0 ]; then

community-content/CODEOWNERS

@@ -1,5 +1,6 @@
 *  @vertex-ai-samples-contributors  @GoogleCloudPlatform/cloudml-samples-owners
 /tf_agents_bandits_movie_recommendation_with_kfp_and_vertex_sdk	@yinghsienwu
+/pytorch_pre_built_images_deployment @googleapis/vertex-prediction-team
 /pytorch_text_classification_using_vertex_sdk_and_gcloud  @RajeshThallam
 /pytorch_text_classification_using_vertex_sdk_and_gcloud		@RajeshThallam @ultrons
 /sklearn_text_classification_from_script_using_vertex_sdk       @maxhardt

community-content/cpr-examples/timm_serving/.gitignore

@@ -2,4 +2,5 @@ cpr_model_server.py
 entrypoint.py
 state_dict.pth
 config.json
-**/__pycache__
+**/__pycache__
+!testdata/**

community-content/cpr-examples/timm_serving/README.md

@@ -2,7 +2,7 @@
 
 ## About CPR
 
-CPR ([custom prediction routines](https://github.com/googleapis/python-aiplatform/blob/custom-prediction-routine/google/cloud/aiplatform/prediction/README.md)) is a framework designed by Google Cloud developers to make it easier to combine machine learning models with custom preprocessing and postprocessing logic in a real-time serving application. 
+CPR ([custom prediction routines](https://github.com/googleapis/python-aiplatform/blob/main/google/cloud/aiplatform/prediction/README.md)) is a framework designed by Google Cloud developers to make it easier to combine machine learning models with custom preprocessing and postprocessing logic in a real-time serving application. 
 
 ## Using this example
 
@@ -34,6 +34,23 @@ Finally, install the Python modules required to build and run the model server:
 pip install -r requirements.txt
 ```
 
+### Auth
+
+This example uses Google Cloud Storage for hosting model artifacts and Artifact Registry to store the container image. 
+You'll need to authorize yourself before you can interact with these.
+
+First, log in to GCP with application default credentials:
+```sh
+gcloud auth application-default login
+```
+
+Next, if you haven't done so already, set up the [gcloud credential helper](https://cloud.google.com/artifact-registry/docs/docker/authentication)
+for the Artifact Registry region where you intend to host the image.  
+```
+gcloud auth configure-docker <region>-docker.pkg.dev
+```
+
+
 ### Predictor
 
 The `TimmPredictor` class in `timm_serving/predictor.py` implements most of the important logic for the server.

community-content/cpr-examples/timm_serving/config.py

@@ -60,9 +60,9 @@ class CPRConfig(object):
     image: str = "timm_predictor:latest"
     artifact_local_dir: str = ""
     region: str = "us-central1"
-    project_id: str = "samthrasher-experimental"
+    project_id: str = "<your project ID here>"
     repository: str = "cpr-images"
-    artifact_gcs_dir: str = "gs://samthrasher-cpr-example/timm-vit224/"
+    artifact_gcs_dir: str = "gs://<your bucket ID here>/timm-vit224/"
     model_name: str = ""
     endpoint_name: str = ""
     machine_type: str = "n1-standard-2"

community-content/cpr-examples/timm_serving/requirements.txt

@@ -5,4 +5,4 @@ timm==0.5.4
 smart_open==6.0.0
 
 google-cloud-storage>=1.26.0,<2.0.0dev
-google-cloud-aiplatform[prediction] @ git+https://github.com/googleapis/python-aiplatform.git@custom-prediction-routine
+google-cloud-aiplatform[prediction]>=1.16.0

community-content/cpr-examples/timm_serving/test.py

@@ -70,7 +70,10 @@ class PredictorUnitTests(absltest.TestCase):
     def setUp(self):
         super().setUp()
         self.config = CPRConfig()
-        self.config.load()
+        try:
+            self.config.load()
+        except FileNotFoundError:
+            logging.info("No saved config file found, using default values.")
         self.predictor = predictor.TimmPredictor()
 
     def test_load_from_saved_state_dict_ok(self):
@@ -170,7 +173,10 @@ class ServerEndToEndTests(absltest.TestCase):
     def setUp(self):
         super().setUp()
         self.config = CPRConfig()
-        self.config.load()
+        try:
+            self.config.load()
+        except FileNotFoundError:
+            logging.info("No saved config file found, using default values.")
         self.local_model = cpr.LocalModel(
             serving_container_spec=aiplatform.gapic.ModelContainerSpec(
                 image_uri=self.config.image

community-content/cpr-examples/timm_serving/testdata/bad_model_1/state_dict.pth

@@ -0,0 +1 @@
+blah

community-content/pytorch_pre_built_images_deployment/README.md

@@ -0,0 +1,30 @@
+# PyTorch Deployment on Google Cloud: Text Classification
+
+**This is an Experimental release**, covered by the Pre-GA Offerings Terms of your Google Cloud Platform [Terms of Service](https://cloud.google.com/terms).
+
+Experiments are focused on validating a prototype and are not guaranteed to be released. They are not intended for production use or covered by any SLA, support obligation, or deprecation policy and might be subject to backward-incompatible changes.
+
+**Kindly drop us a note before you run any scale tests.**
+
+**Do not hesitate to contact vertexai-prediction-preview-feedback@google.com if you have any questions or run into any issues.**
+
+The projects need to be added to the allowlist in order to deploy PyTorch models using Vertex AI Prediction pre-built PyTorch images. If you are interested in the feature, please send an email to vertexai-prediction-preview-feedback@google.com to provide your project numbers OR project ids.
+
+## Overview
+
+In the PyTorch on Google Cloud series of blog posts, we aim to share how to deploy PyTorch models at scale on [Vertex AI](https://cloud.google.com/vertex-ai).
+
+This tutorial on text classification shows how to deploy a PyTorch based text classification model on [Vertex AI](https://cloud.google.com/vertex-ai/docs/start/client-libraries#python) using Vertex SDK and [`gcloud ai`](https://cloud.google.com/sdk/gcloud/reference/beta/ai).
+
+## Notebooks
+
+| <h4>Notebook</h4> | <h4>Description</h4>                       |
+| :-------- | :------- |
+| [pytorch-text-classification-vertex-ai-deploy.ipynb](./pytorch-text-classification-vertex-ai-deploy.ipynb) | Notebook to show deploying a PyTorch model on Vertex AI |
+
+## Folders
+
+
+| <h4>Folder Name</h4> | <h4>Description</h4>                       |
+| :-------- | :------- |
+| [`predictor`](./predictor) | Folder with custom prediction handler to deploy a PyTorch model to Vertex Prediction. In the [notebook](./pytorch-text-classification-vertex-ai-deploy.ipynb), this folder is used for deploying a PyTorch model on Vertex AI using Vertex Prediction pre-built PyTorch images |

community-content/pytorch_pre_built_images_deployment/predictor/custom_handler.py

@@ -0,0 +1,91 @@
+
+import os
+import json
+import logging
+
+import torch
+from transformers import AutoModelForSequenceClassification, AutoTokenizer
+from ts.torch_handler.base_handler import BaseHandler
+
+logger = logging.getLogger(__name__)
+
+
+class TransformersClassifierHandler(BaseHandler):
+    """
+    The handler takes an input string and returns the classification text 
+    based on the serialized transformers checkpoint.
+    """
+    def __init__(self):
+        super(TransformersClassifierHandler, self).__init__()
+        self.initialized = False
+
+    def initialize(self, ctx):
+        """ Loads the model.pt file and initialized the model object.
+        Instantiates Tokenizer for preprocessor to use
+        Loads labels to name mapping file for post-processing inference response
+        """
+        self.manifest = ctx.manifest
+
+        properties = ctx.system_properties
+        model_dir = properties.get("model_dir")
+        self.device = torch.device("cuda:" + str(properties.get("gpu_id")) if torch.cuda.is_available() else "cpu")
+
+        # Read model serialize/pt file
+        serialized_file = self.manifest["model"]["serializedFile"]
+        model_pt_path = os.path.join(model_dir, serialized_file)
+        if not os.path.isfile(model_pt_path):
+            raise RuntimeError("Missing the model.pt or pytorch_model.bin file")
+        
+        # Load model
+        self.model = AutoModelForSequenceClassification.from_pretrained(model_dir)
+        self.model.to(self.device)
+        self.model.eval()
+        logger.debug('Transformer model from path {0} loaded successfully'.format(model_dir))
+        
+        # Ensure to use the same tokenizer used during training
+        self.tokenizer = AutoTokenizer.from_pretrained('bert-base-cased')
+
+        # Read the mapping file, index to object name
+        mapping_file_path = os.path.join(model_dir, "index_to_name.json")
+
+        if os.path.isfile(mapping_file_path):
+            with open(mapping_file_path) as f:
+                self.mapping = json.load(f)
+        else:
+            logger.warning('Missing the index_to_name.json file. Inference output will default.')
+            self.mapping = {"0": "Negative",  "1": "Positive"}
+
+        self.initialized = True
+
+    def preprocess(self, data):
+        """ Preprocessing input request by tokenizing
+            Extend with your own preprocessing steps as needed
+        """
+        text = data[0].get("data")
+        if text is None:
+            text = data[0].get("body")
+        sentences = text.decode('utf-8')
+        logger.info("Received text: '%s'", sentences)
+
+        # Tokenize the texts
+        tokenizer_args = ((sentences,))
+        inputs = self.tokenizer(*tokenizer_args,
+                                padding='max_length',
+                                max_length=128,
+                                truncation=True,
+                                return_tensors = "pt")
+        return inputs
+
+    def inference(self, inputs):
+        """ Predict the class of a text using a trained transformer model.
+        """
+        prediction = self.model(inputs['input_ids'].to(self.device))[0].argmax().item()
+
+        if self.mapping:
+            prediction = self.mapping[str(prediction)]
+
+        logger.info("Model predicted: '%s'", prediction)
+        return [prediction]
+
+    def postprocess(self, inference_output):
+        return inference_output

community-content/pytorch_pre_built_images_deployment/predictor/index_to_name.json

@@ -0,0 +1,5 @@
+
+{
+    "0": "Negative", 
+    "1": "Positive"
+}

community-content/pytorch_text_classification_using_vertex_sdk_and_gcloud/pytorch-text-classification-vertex-ai-train-tune-deploy.ipynb

@@ -658,8 +658,8 @@
       },
       "outputs": [],
       "source": [
-        "datasets = load_dataset(\"imdb\")\n",
-        "datasets"
+        "dataset = load_dataset(\"imdb\")\n",
+        "dataset"
       ]
     },
     {
@@ -668,7 +668,7 @@
         "id": "RzfPtOMoIrIu"
       },
       "source": [
-        "The `datasets` object itself is [`DatasetDict`](https://huggingface.co/docs/datasets/package_reference/main_classes.html#datasetdict), which contains one key for the training, validation and test set."
+        "The `dataset` object itself is [`DatasetDict`](https://huggingface.co/docs/datasets/package_reference/main_classes.html#datasetdict), which contains one key for the training, validation and test set."
       ]
     },
     {
@@ -681,12 +681,12 @@
       "source": [
         "print(\n",
         "    \"Total # of rows in training dataset {} and size {:5.2f} MB\".format(\n",
-        "        datasets[\"train\"].shape[0], datasets[\"train\"].size_in_bytes / (1024 * 1024)\n",
+        "        dataset[\"train\"].shape[0], dataset[\"train\"].size_in_bytes / (1024 * 1024)\n",
         "    )\n",
         ")\n",
         "print(\n",
         "    \"Total # of rows in test dataset {} and size {:5.2f} MB\".format(\n",
-        "        datasets[\"test\"].shape[0], datasets[\"test\"].size_in_bytes / (1024 * 1024)\n",
+        "        dataset[\"test\"].shape[0], dataset[\"test\"].size_in_bytes / (1024 * 1024)\n",
         "    )\n",
         ")"
       ]
@@ -708,7 +708,7 @@
       },
       "outputs": [],
       "source": [
-        "datasets[\"train\"][0]"
+        "dataset[\"train\"][0]"
       ]
     },
     {
@@ -728,7 +728,7 @@
       },
       "outputs": [],
       "source": [
-        "label_list = datasets[\"train\"].unique(\"label\")\n",
+        "label_list = dataset[\"train\"].unique(\"label\")\n",
         "label_list"
       ]
     },
@@ -779,7 +779,7 @@
       },
       "outputs": [],
       "source": [
-        "show_random_elements(datasets[\"train\"])"
+        "show_random_elements(dataset[\"train\"])"
       ]
     },
     {
@@ -883,7 +883,7 @@
       },
       "outputs": [],
       "source": [
-        "example = datasets[\"train\"][4]\n",
+        "example = dataset[\"train\"][4]\n",
         "print(example)"
       ]
     },
@@ -920,7 +920,7 @@
       "source": [
         "# Dataset loading repeated here to make this cell idempotent\n",
         "# Since we are over-writing datasets variable\n",
-        "datasets = load_dataset(\"imdb\")\n",
+        "dataset = load_dataset(\"imdb\")\n",
         "\n",
         "# Mapping labels to ids\n",
         "# NOTE: We can extract this automatically but the `Unique` method of the datasets\n",
@@ -948,7 +948,7 @@
         "\n",
         "\n",
         "# apply preprocessing function to input examples\n",
-        "datasets = datasets.map(preprocess_function, batched=True, load_from_cache_file=True)"
+        "dataset = dataset.map(preprocess_function, batched=True, load_from_cache_file=True)"
       ]
     },
     {
@@ -1091,8 +1091,8 @@
         "trainer = Trainer(\n",
         "    model,\n",
         "    args,\n",
-        "    train_dataset=datasets[\"train\"],\n",
-        "    eval_dataset=datasets[\"test\"],\n",
+        "    train_dataset=dataset[\"train\"],\n",
+        "    eval_dataset=dataset[\"test\"],\n",
         "    data_collator=default_data_collator,\n",
         "    tokenizer=tokenizer,\n",
         "    compute_metrics=compute_metrics,\n",

notebooks/community/CODEOWNERS

@@ -17,6 +17,7 @@
 /explainable_ai/SDK_Custom_Container_XAI.ipynb @brianchunkang
 /matching_engine/sdk_matching_engine_for_indexing.ipynb @ivanmkc
 /matching_engine/matching_engine_for_indexing.ipynb @yinghsienwu
+/matching_engine/stream_update_for_matching_engine.ipynb @peterping666
 /sdk/pytorch_lightning_custom_container_training.ipynb @brianchunkang
 /tensorboard @yfang1
 /feature_store @nayaknishant @morgandu
@@ -27,4 +28,8 @@
 /notebooks/community/ml_ops/stage2/get_started_with_visionapi_and_automl.ipynb @mansari
 /notebooks/community/neo4j/graph_paysim.ipynb @benofben @laeg
 /notebooks/community/ml_ops/stage1/get_started_with_visionapi_and_vertex_datasets.ipynb @mansari
-/notebooks/community/pipelines/google_cloud_pipeline_components_bqml_pipeline_demand_forecasting.ipynb @inardini
+/notebooks/community/pipelines/google_cloud_pipeline_components_bqml_pipeline_demand_forecasting.ipynb @inardini
+/notebooks/community/ml_ops/stage2/get_started_vertex_hpt_r_kernel.ipynb @fhirschmann
+/notebooks/community/ml_ops/stage2/get_started_vertex_training_r_using_r_kernel.ipynb @fhirschmann
+/notebooks/community/vertex-ai-samples/notebooks/community/model_registry/vertex_ai_model_registry_bqml_custom_model_versioning.ipynb @inardini
+/notebooks/community/vertex-ai-samples/notebooks/community/model_registry/vertex_ai_model_registry_automl_model_versioning.ipynb @inardini

notebooks/community/feature_store/gapic-feature-store.ipynb

@@ -292,6 +292,37 @@
         "    PROJECT_ID = \"python-docs-samples-tests\"  # @param {type:\"string\"}"
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "d9f118b92c74"
+      },
+      "source": [
+        "#### UUID\n",
+        "\n",
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "3ee72715c0fd"
+      },
+      "outputs": [],
+      "source": [
+        "import random\n",
+        "import string\n",
+        "\n",
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -478,7 +509,6 @@
         "from google.cloud.aiplatform_v1.types import \\\n",
         "    featurestore_service as featurestore_service_pb2\n",
         "from google.cloud.aiplatform_v1.types import io as io_pb2\n",
-        "from google.protobuf.duration_pb2 import Duration\n",
         "\n",
         "# Create admin_client for CRUD and data_client for reading feature values.\n",
         "admin_client = FeaturestoreServiceClient(client_options={\"api_endpoint\": API_ENDPOINT})\n",
@@ -542,7 +572,7 @@
       },
       "outputs": [],
       "source": [
-        "FEATURESTORE_ID = \"movie_prediction\"\n",
+        "FEATURESTORE_ID = f\"movie_prediction_{UUID}\"\n",
         "try:\n",
         "    create_lro = admin_client.create_featurestore(\n",
         "        featurestore_service_pb2.CreateFeaturestoreRequest(\n",
@@ -567,7 +597,7 @@
         "id": "ag8pCQ7rNjVf"
       },
       "source": [
-        "You can use [GetFeaturestore](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1beta1#google.cloud.aiplatform.v1beta1.FeaturestoreService.GetFeaturestore) or [ListFeaturestores](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1beta1#google.cloud.aiplatform.v1beta1.FeaturestoreService.ListFeaturestores) to check if the Featurestore was successfully created. The following example gets the details of the Featurestore.\n"
+        "You can use [GetFeaturestore](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1#google.cloud.aiplatform.v1.FeaturestoreService.GetFeaturestore) or [ListFeaturestores](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1#google.cloud.aiplatform.v1.FeaturestoreService.ListFeaturestores) to check if the Featurestore was successfully created. The following example gets the details of the Featurestore.\n"
       ]
     },
     {
@@ -589,7 +619,7 @@
         "id": "018ab19d934f"
       },
       "source": [
-        "Auto scaling is available in v1beta1 since v1.11. Below is the example for the `CreateFeaturestoreRequest` with auto-scaling, use it with `aiplatform_v1beta1.FeaturestoreServiceClient` to create Featurestore:"
+        "Auto scaling is available in v1 since v1.11. Below is the example for the `CreateFeaturestoreRequest` with auto-scaling, use it with `aiplatform_v1.FeaturestoreServiceClient` to create Featurestore:"
       ]
     },
     {
@@ -600,17 +630,17 @@
       },
       "outputs": [],
       "source": [
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    featurestore as v1beta1_featurestore_pb2\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    featurestore_service as v1beta1_featurestore_service_pb2\n",
+        "from google.cloud.aiplatform_v1.types import \\\n",
+        "    featurestore as v1_featurestore_pb2\n",
+        "from google.cloud.aiplatform_v1.types import \\\n",
+        "    featurestore_service as v1_featurestore_service_pb2\n",
         "\n",
-        "create_featurestore_request = v1beta1_featurestore_service_pb2.CreateFeaturestoreRequest(\n",
+        "create_featurestore_request = v1_featurestore_service_pb2.CreateFeaturestoreRequest(\n",
         "    parent=BASE_RESOURCE_PATH,\n",
         "    featurestore_id=FEATURESTORE_ID,\n",
-        "    featurestore=v1beta1_featurestore_pb2.Featurestore(\n",
-        "        online_serving_config=v1beta1_featurestore_pb2.Featurestore.OnlineServingConfig(\n",
-        "            scaling=v1beta1_featurestore_pb2.Featurestore.OnlineServingConfig.Scaling(\n",
+        "    featurestore=v1_featurestore_pb2.Featurestore(\n",
+        "        online_serving_config=v1_featurestore_pb2.Featurestore.OnlineServingConfig(\n",
+        "            scaling=v1_featurestore_pb2.Featurestore.OnlineServingConfig.Scaling(\n",
         "                min_node_count=1, max_node_count=5\n",
         "            )\n",
         "        ),\n",
@@ -681,7 +711,7 @@
         "id": "dPkT7KDuEvWv"
       },
       "source": [
-        "Feature [monitoring](https://cloud.google.com/vertex-ai/docs/featurestore/monitoring) is in preview, so you need to use v1beta1 Python. Import feature analysis is only available through SDK for now."
+        "Feature [monitoring](https://cloud.google.com/vertex-ai/docs/featurestore/monitoring) is in preview, so you need to use v1 Python. Import feature analysis is only available through SDK for now."
       ]
     },
     {
@@ -692,36 +722,35 @@
       },
       "outputs": [],
       "source": [
-        "from google.cloud.aiplatform_v1beta1 import \\\n",
-        "    FeaturestoreServiceClient as v1beta1_FeaturestoreServiceClient\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    entity_type as v1beta1_entity_type_pb2\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    featurestore_monitoring as v1beta1_featurestore_monitoring_pb2\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    featurestore_service as v1beta1_featurestore_service_pb2\n",
+        "from google.cloud.aiplatform_v1 import \\\n",
+        "    FeaturestoreServiceClient as v1_FeaturestoreServiceClient\n",
+        "from google.cloud.aiplatform_v1.types import entity_type as v1_entity_type_pb2\n",
+        "from google.cloud.aiplatform_v1.types import \\\n",
+        "    featurestore_monitoring as v1_featurestore_monitoring_pb2\n",
+        "from google.cloud.aiplatform_v1.types import \\\n",
+        "    featurestore_service as v1_featurestore_service_pb2\n",
         "\n",
-        "v1beta1_admin_client = v1beta1_FeaturestoreServiceClient(\n",
+        "v1_admin_client = v1_FeaturestoreServiceClient(\n",
         "    client_options={\"api_endpoint\": API_ENDPOINT}\n",
         ")\n",
         "\n",
         "# Enable import feature analysis for users entity type.\n",
         "# All Features belonging to this EntityType will by default inherit the monitoring config.\n",
-        "v1beta1_admin_client.update_entity_type(\n",
-        "    v1beta1_featurestore_service_pb2.UpdateEntityTypeRequest(\n",
-        "        entity_type=v1beta1_entity_type_pb2.EntityType(\n",
+        "v1_admin_client.update_entity_type(\n",
+        "    v1_featurestore_service_pb2.UpdateEntityTypeRequest(\n",
+        "        entity_type=v1_entity_type_pb2.EntityType(\n",
         "            name=admin_client.entity_type_path(\n",
         "                PROJECT_ID, REGION, FEATURESTORE_ID, \"users\"\n",
         "            ),\n",
-        "            monitoring_config=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig(\n",
-        "                import_features_analysis=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ImportFeaturesAnalysis(\n",
-        "                    anomaly_detection_baseline=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ImportFeaturesAnalysis.Baseline.LATEST_STATS,\n",
-        "                    state=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ImportFeaturesAnalysis.State.ENABLED,\n",
+        "            monitoring_config=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig(\n",
+        "                import_features_analysis=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ImportFeaturesAnalysis(\n",
+        "                    anomaly_detection_baseline=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ImportFeaturesAnalysis.Baseline.LATEST_STATS,\n",
+        "                    state=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ImportFeaturesAnalysis.State.ENABLED,\n",
         "                ),\n",
-        "                numerical_threshold_config=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
+        "                numerical_threshold_config=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
         "                    value=0.001,\n",
         "                ),\n",
-        "                categorical_threshold_config=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
+        "                categorical_threshold_config=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
         "                    value=0.001,\n",
         "                ),\n",
         "            ),\n",
@@ -736,7 +765,7 @@
         "id": "85b1f59fbf6d"
       },
       "source": [
-        "The easiest way to set up snapshot analysis for now is using [console UI](https://console.cloud.google.com/vertex-ai/features). For completeness, below is example to do this using v1beta1 SDK.\n",
+        "The easiest way to set up snapshot analysis for now is using [console UI](https://console.cloud.google.com/vertex-ai/features). For completeness, below is example to do this using v1 SDK.\n",
         "\n",
         "You can view monitoring statistics on [console UI](https://console.cloud.google.com/vertex-ai/features)."
       ]
@@ -749,36 +778,35 @@
       },
       "outputs": [],
       "source": [
-        "from google.cloud.aiplatform_v1beta1 import \\\n",
-        "    FeaturestoreServiceClient as v1beta1_FeaturestoreServiceClient\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    entity_type as v1beta1_entity_type_pb2\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    featurestore_monitoring as v1beta1_featurestore_monitoring_pb2\n",
-        "from google.cloud.aiplatform_v1beta1.types import \\\n",
-        "    featurestore_service as v1beta1_featurestore_service_pb2\n",
+        "from google.cloud.aiplatform_v1 import \\\n",
+        "    FeaturestoreServiceClient as v1_FeaturestoreServiceClient\n",
+        "from google.cloud.aiplatform_v1.types import entity_type as v1_entity_type_pb2\n",
+        "from google.cloud.aiplatform_v1.types import \\\n",
+        "    featurestore_monitoring as v1_featurestore_monitoring_pb2\n",
+        "from google.cloud.aiplatform_v1.types import \\\n",
+        "    featurestore_service as v1_featurestore_service_pb2\n",
         "\n",
-        "v1beta1_admin_client = v1beta1_FeaturestoreServiceClient(\n",
+        "v1_admin_client = v1_FeaturestoreServiceClient(\n",
         "    client_options={\"api_endpoint\": API_ENDPOINT}\n",
         ")\n",
         "\n",
         "# Enable snapshot analysis for users entity type.\n",
         "# All Features belonging to this EntityType will by default inherit the monitoring config.\n",
-        "v1beta1_admin_client.update_entity_type(\n",
-        "    v1beta1_featurestore_service_pb2.UpdateEntityTypeRequest(\n",
-        "        entity_type=v1beta1_entity_type_pb2.EntityType(\n",
+        "v1_admin_client.update_entity_type(\n",
+        "    v1_featurestore_service_pb2.UpdateEntityTypeRequest(\n",
+        "        entity_type=v1_entity_type_pb2.EntityType(\n",
         "            name=admin_client.entity_type_path(\n",
         "                PROJECT_ID, REGION, FEATURESTORE_ID, \"users\"\n",
         "            ),\n",
-        "            monitoring_config=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig(\n",
-        "                snapshot_analysis=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.SnapshotAnalysis(\n",
-        "                    monitoring_interval=Duration(seconds=86400),  # 1 day\n",
+        "            monitoring_config=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig(\n",
+        "                snapshot_analysis=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.SnapshotAnalysis(\n",
+        "                    monitoring_interval_days=1,  # 1 day\n",
         "                    staleness_days=30,\n",
         "                ),\n",
-        "                numerical_threshold_config=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
+        "                numerical_threshold_config=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
         "                    value=0.001,\n",
         "                ),\n",
-        "                categorical_threshold_config=v1beta1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
+        "                categorical_threshold_config=v1_featurestore_monitoring_pb2.FeaturestoreMonitoringConfig.ThresholdConfig(\n",
         "                    value=0.001,\n",
         "                ),\n",
         "            ),\n",
@@ -891,8 +919,8 @@
       "source": [
         "## Search created features\n",
         "\n",
-        "While the [ListFeatures](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1beta1#google.cloud.aiplatform.v1beta1.FeaturestoreService.ListFeatures) method allows you to easily view all features of a single\n",
-        "entity type, the [SearchFeatures](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1beta1#google.cloud.aiplatform.v1beta1.FeaturestoreService.SearchFeatures) method searches across all featurestores\n",
+        "While the [ListFeatures](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1#google.cloud.aiplatform.v1.FeaturestoreService.ListFeatures) method allows you to easily view all features of a single\n",
+        "entity type, the [SearchFeatures](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1#google.cloud.aiplatform.v1.FeaturestoreService.SearchFeatures) method searches across all featurestores\n",
         "and entity types in a given location (such as `us-central1`). This can help you discover features that were created by someone else.\n",
         "\n",
         "You can query based on feature properties including feature ID, entity type ID,\n",
@@ -1206,7 +1234,7 @@
       },
       "source": [
         "The\n",
-        "[Online Serving APIs](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1beta1#featurestoreonlineservingservice)\n",
+        "[Online Serving APIs](https://cloud.google.com/vertex-ai/docs/reference/rpc/google.cloud.aiplatform.v1#featurestoreonlineservingservice)\n",
         "lets you serve feature values for small batches of entities. It's designed for latency-sensitive service, such as online model prediction. For example, for a movie service, you might want to quickly shows movies that the current user would most likely watch by using online predictions."
       ]
     },

notebooks/community/ml_ops/stage1/README.md

@@ -28,50 +28,46 @@ The first stage in MLOps is the collection and preparation for the purpose of de
 
 ### Get Started
 
-[Get started with Vertex AI datasets](get_started_vertex_datasets.ipynb)
+[Get started with Dataflow](community/ml_ops/stage1/get_started_dataflow.ipynb)
+
+In this tutorial, you learn how to use `Dataflow` for training with `Vertex AI`.
 
-```
 The steps performed include:
-- Create a Vertex AI `Dataset` resource for:
-    - image data
-    - text data
-    - video data
-    - tabular data
-    - forecasting data
-- Search `Dataset` resources using a filter.
-- Read a sample of a `BigQuery` dataset into a dataframe.
-- Generate statistics and data schema using TensorFlow Data Validation from the samples in the dataframe.
-- Detect anomalies in new data using TensorFlow Data Validation.
-- Generate a TFRecord feature specification using TensorFlow Transform from the data schema.
-- Export a dataset and convert to TFRecords.
-```
 
-[Get started with Dataflow](get_started_dataflow.ipynb)
-
-```
-The steps performed include:
 - Offline preprocessing of data:
     - Serially - w/o dataflow
     - Parallel - with dataflow
 - Upstream preprocessing of data:
     - tabular data
     - image data
-```
 
-[Create an unlabelled Vertex AI AutoML text entity extraction dataset from pdfs using Vision API](get_started_with_visionapi_and_vertex_datasets.ipynb)
+[Get started with Vertex AI datasets](community/ml_ops/stage1/get_started_vertex_datasets.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Dataset` for training with `Vertex AI`.
 
-```
 The steps performed include:
-1. Using `Vision API` to perform Optical Character Recognition (OCR) to extract text from PDF files.
-2. Processing the results and saving them to text files.
-3. Generating a `Vertex AI Dataset` import file.
-4. Creating a new unlabelled text entity extraction `Vertex AI Dataset` resource in `Vertex AI`.
-```
 
-[Get started with BigQuery datasets](get_started_bq_datasets.ipynb)
+- Create a Vertex AI `Dataset` resource for:
+    - image data
+    - text data
+    - video data
+    - tabular data
+    - forecasting data
+
+
+- Search `Dataset` resources using a filter.
+- Read a sample of a `BigQuery` dataset into a dataframe.
+- Generate statistics and data schema using TensorFlow Data Validation from the samples in the dataframe.
+- Detect anomalies in new data using TensorFlow Data Validation.
+- Generate a TFRecord feature specification using TensorFlow Transform from the data schema.
+- Export a dataset and convert to TFRecords.
+
+[Get started with BigQuery datasets](community/ml_ops/stage1/get_started_bq_datasets.ipynb)
+
+In this tutorial, you learn how to use `BigQuery` as a dataset for training with `Vertex AI`.
 
-```
 The steps performed include:
+
 - Create a Vertex AI `Dataset` resource from `BigQuery` table -- compatible for `AutoML` training.
 - Extract a copy of the dataset from `BigQuery` to a CSV file in Cloud Storage -- compatible for `AutoML` or custom training.
 - Select rows from a `BigQuery` dataset into a `pandas` dataframe -- compatible for custom training.
@@ -79,19 +75,32 @@ The steps performed include:
 - Select rows from extracted CSV files into a `tf.data.Dataset` -- compatible for custom training `TensorFlow` models.
 - Create a `BigQuery` dataset from CSV files.
 - Extract data from `BigQuery` table into a `DMatrix` -- compatible for custom training `XGBoost` models.
-```
 
-[Get started with Vertex AI data labeling](get_started_with_data_labeling.ipynb)
+[Get started with Vertex AI Data Labeling](community/ml_ops/stage1/get_started_with_data_labeling.ipynb)
+
+In this tutorial, you learn how to use the `Vertex AI Data Labeling` service.
 
-```
 The steps performed include:
+
 - Create a Specialist Pool for data labelers.
 - Create a data labeling job.
 - Submit the data labeling job.
 - List data labeling jobs.
 - Cancel a data labeling job.
 
-```
+
+
+[Create an unlabelled Vertex AI AutoML text entity extraction dataset from PDFs using Vision API](community/ml_ops/stage1/get_started_with_visionapi_and_vertex_datasets.ipynb)
+
+In this tutorial, you learn to use `Vision API` to extract text from PDF files stored on a Cloud Storage bucket. You then process the results and create an unlabelled `Vertex AI Dataset`, compatible with `AutoML`, for text entity extraction.
+
+The steps performed include:
+
+1. Using `Vision API` to perform Optical Character Recognition (OCR) to extract text from PDF files.
+2. Processing the results and saving them to text files.
+3. Generating a `Vertex AI Dataset` import file.
+4. Creating a new unlabelled text entity extraction `Vertex AI Dataset` resource in `Vertex AI`.
+
 
 ### E2E Stage Example
 

notebooks/community/ml_ops/stage1/get_started_with_data_labeling.ipynb

@@ -212,7 +212,7 @@
         "\n",
         "3. [Enable the Vertex AI APIs and Compute Engine APIs.](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component)\n",
         "\n",
-        "4. [Google Cloud SDK](https://cloud.google.com/sdk) is already installed in Google Cloud Notebooks.\n",
+        "4. [Google Cloud SDK](https://cloud.google.com/sdk) is already installed in Vertex AI Workbench Notebooks.\n",
         "\n",
         "5. Enter your project ID in the cell below. Then run the  cell to make sure the\n",
         "Cloud SDK uses the right project for all the commands in this notebook.\n",
@@ -374,15 +374,8 @@
         "### Authenticate your Google Cloud account\n",
         "\n",
         "**If you are using Vertex AI Workbench Notebooks**, your environment is already\n",
-        "authenticated. Skip this step."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "32e1cd21a5d5"
-      },
-      "source": [
+        "authenticated. \n",
+        "\n",
         "**If you are using Colab**, run the cell below and follow the instructions\n",
         "when prompted to authenticate your account via oAuth.\n",
         "\n",

notebooks/community/ml_ops/stage1/mlops_data_management.ipynb

@@ -39,18 +39,15 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "        <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage1/mlops_data_management.ipynb\">\n",
-        "        <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\\\" alt=\"Colab logo\"> Run in Colab\n",
-        "        </a>\n",
-        "  </td>\n",
-        "  <td>\n",
         "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/ml_ops/stage1/mlops_data_management.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
         "  </td>\n",
         "</table>\n",
-        "<br/><br/><br/>"
+        "<br/><br/><br/>\n",
+        "\n",
+        "*Note: This notebook is not supported for execution in Colab*"
       ]
     },
     {
@@ -169,21 +166,20 @@
         "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
         "\n",
-        "ONCE_ONLY = True\n",
+        "ONCE_ONLY = False\n",
         "if ONCE_ONLY:\n",
-        "    ! pip3 install -U tensorflow==2.5 $USER_FLAG -q\n",
-        "    ! pip3 install -U tensorflow-data-validation==1.2 $USER_FLAG -q\n",
-        "    ! pip3 install -U tensorflow-transform==1.2 $USER_FLAG -q\n",
-        "    ! pip3 install -U tensorflow-io==0.18 $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-aiplatform[tensorboard] $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-pipeline-components $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-bigquery $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-logging $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade apache-beam[gcp]==2.33.0 $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade pyarrow $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade cloudml-hypertune $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade kfp $USER_FLAG -q\n",
-        "    ! pip3 install future $USER_FLAG -q"
+        "    ! pip3 install -U {USER_FLAG} -q tensorflow==2.5 \\\n",
+        "                                     tensorflow-data-validation==1.2 \\\n",
+        "                                     tensorflow-transform==1.2 \\\n",
+        "                                     tensorflow-io==0.18 \n",
+        "    \n",
+        "    ! pip3 install --upgrade {USER_FLAG} -q google-cloud-aiplatform[tensorboard] \\\n",
+        "                                            google-cloud-pipeline-components \\\n",
+        "                                            google-cloud-bigquery \\\n",
+        "                                            google-cloud-logging \\\n",
+        "                                            apache-beam[gcp] \\\n",
+        "                                            pyarrow \\\n",
+        "                                            cloudml-hypertune\n"
       ]
     },
     {
@@ -355,7 +351,7 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. \n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -417,7 +413,7 @@
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "When you submit a custom training job using the Vertex SDK, you upload a Python package\n",
+        "When you submit a custom training job using the Vertex AI SDK, you upload a Python package\n",
         "containing your training code to a Cloud Storage bucket. Vertex AI runs\n",
         "the code from this package. In this tutorial, Vertex AI also saves the\n",
         "trained model that results from your job in the same bucket. You can then\n",

notebooks/community/ml_ops/stage2/README.md

@@ -35,44 +35,59 @@ The second stage in MLOps is experimenting in developing one or more baseline mo
 
 ### Get Started
 
+[Get started with Vertex AI Training for R](community/ml_ops/stage2/get_started_vertex_training_r.ipynb)
 
-[Get started with Vertex AI Training for Pytorch](get_started_vertex_training_pytorch.ipynb)
+In this tutorial, you learn how to use `Vertex AI Training` for training a R custom model.
 
-```
 The steps performed include:
-- Single node training using a Python package.
+
+- Locally train an R model in a notebook using %%R magic commands
+- Create a deployment image with trained R model and serving functions.
+- Test the deployment image locally.
+- Create a `Vertex AI Model` resource for the deployment image with embedded R model.
+- Deploy the deployment image with embedded R model to a `Vertex AI Endpoint` resource.
+- Test the deployment image with embedded R model.
+- Create a R-to-Python training package.
+- Create a training image for training the model.
+- Train a R model using `Vertex AI Trainingh` service with the R-to-Python training package.
+
+[Get started with Logging](community/ml_ops/stage2/get_started_with_logging.ipynb)
+
+In this tutorial, you learn how to use Python and Cloud logging awhen training with `Vertex AI`.
+
+The steps performed include:
+
+- Use Python logging to log training configuration/results locally.
+- Use Google Cloud Logging to log training configuration/results in cloud storage.
+
+[Get started with Vertex AI Hyperparameter Tuning for XGBoost] (community/ml_ops/stage2/get_started_vertex_hpt_xgboost.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Hyperparameter Tuning` for training a XGBoost custom model.
+
+The steps performed include:
+
+- Training using a Python package.
 - Report accuracy when hyperparameter tuning.
 - Save the model artifacts to Cloud Storage using GCSFuse.
 - Create a `Vertex AI Model` resource.
-```
 
-[Get started with prebuilt TFHub models](get_started_with_tfhub_models.ipynb)
+[Get started with Vertex AI Training for XGBoost](community/ml_ops/stage2/get_started_vertex_training_xgboost.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Training` for training a XGBoost custom model.
 
-```
 The steps performed include:
-- Download a TensorFlow Hub prebuilt model.
-- Add the task component as a classifier for the CIFAR-10 dataset.
-- Fine tune locally the model with transfer learning training.
-- Construct a custom training script:
-    - Get training data from TensorFlow Datasets
-    - Get model architecture from TensorFlow Hub
-    - Train then model
-    - Save model artifacts and upload as Vertex AI Model resource.
-```
 
-[Get started with Vertex AI TensorBoard](get_started_vertex_tensorboard.ipynb)
+- Training using a Python package.
+- Report accuracy when hyperparameter tuning.
+- Save the model artifacts to Cloud Storage using GCSFuse.
+- Create a `Vertex AI Model` resource.
+
+[Get started with TabNet builtin algorithm for training tabular models](community/ml_ops/stage2/get_started_with_tabnet.ipynb)
+
+In this notebook, you learn how to run `Vertex AI TabNet` built algorithm for training custom tabular models.
 
-```
 The steps performed include:
-- Create a TensorBoard callback when training a model.
-- Using Tensorboard with locally trained model.
-- Using Vertex AI TensorBoard with Vertex AI Training.
-```
 
-[Get started with TabNet builtin algorithm for training tabular models](get_started_with_tabnet.ipynb)
-
-```
-The steps performed include:
 - Get the training data.
 - Configure training parameters for the `Vertex AI TabNet` container.
 - Train the model using `Vertex AI Training` using CSV data.
@@ -82,50 +97,107 @@ The steps performed include:
 - Hyperparameter tuning the `Vertex AI TabNet` model.
 - Train the model using `Vertex AI Training` using BigQuery table.
 
-```
+[Get started with prebuilt TFHub models](community/ml_ops/stage2/get_started_with_tfhub_models.ipynb)
 
-[Get started with Vertex AI Vizier](get_started_vertex_vizier.ipynb)
+In this tutorial, you learn how to use `Vertex AI Training` with prebuilt models from TensorFlow Hub.
 
-```
 The steps performed include:
+
+- Download a TensorFlow Hub prebuilt model.
+- Add the task component as a classifier for the CIFAR-10 dataset.
+- Fine tune locally the model with transfer learning training.
+- Construct a custom training script:
+    - Get training data from TensorFlow Datasets
+    - Get model architecture from TensorFlow Hub
+    - Train then model
+    - Save model artifacts and upload as Vertex AI Model resource.
+
+[Get started with BigQuery ML Training](community/ml_ops/stage2/get_started_bqml_training.ipynb)
+
+In this tutorial, you learn how to use `BigQueryML` (BQML) for training with `Vertex AI`.
+
+The steps performed include:
+
+- Create a local BigQuery table in your project
+- Train a BQML model
+- Evaluate the BQML model
+- Export the BQML model as a cloud model
+- Upload the exported model as a `Vertex AI Model` resource
+- Hyperparameter tune a BQML model with `Vertex AI Vizier`
+- Automatically register a BQML model to `Vertex AI Model Registry`
+
+[Get started with Vertex AI Vizier](community/ml_ops/stage2/get_started_vertex_vizier.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Vizier` for when training with `Vertex AI`.
+
+The steps performed include:
+
 - Hyperparameter tuning with Random algorithm.
 - Hyperparameter tuning with Vizier (Bayesian) algorithm.
-```
+- Suggesting trials and updating results for Vizier study
 
-[Automl image classfication training with customer managed encryption keys (CMEK)](get_started_with_cmek_training.ipynb)
+[Get started with distributed training using DASK](community/ml_ops/stage2/get_started_with_distributed_training_xgboost.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Training` for distributed training of XGBoost model using the OSS package DASK. Additionally, you learn to construct and deploy a custom serving container using a Flask web server.
 
-```
 The steps performed include:
-- Creating a customer managed encryption key.
-- Creating an image dataset with CMEK encryption.
-- Train an AutoML model with CMEK encryption.
-```
 
-[Get started with Vertex AI distributed training](get_started_vertex_distributed_training.ipynb)
+- Construct an XGBoost training script using DASK for distributed training.
+- Construct a custom training container.
+- Configure a distributed custom training job.
+- Execute the custom training job.
+- Construct a custom serving container using Flask.
+- Upload the trained XGBoost model as a `Vertex AI Model` resource.
+- Create a `Vertex AI Endpoint` resource.
+- Deploy the `Vertex AI Model` resource to `Vertex AI Endpoint` resource.
+- Make a prediction.
+
+[Get started with Vertex AI TensorBoard](community/ml_ops/stage2/get_started_vertex_tensorboard.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI TensorBoard` when training with `Vertex AI`.
 
-```
 The steps performed include:
-- `MirroredStrategy`: Train on a single VM with multiple GPUs.
-- `MultiWorkerMirroredStrategy`: Train on multiple VMs with automatic setup of replicas.
-- `MultiWorkerMirroredStrategy`: Train on multiple VMs with fine grain control of replicas.
-- `ReductionServer`: Train on multiple VMS and sync updates across VMS with `Vertex AI Reduction Server`.
-- `TPUTraining`: Train with multiple Cloud TPUs.
-```
 
-[Get started with Vertex AI Training for scikit-learn](get_started_vertex_training_sklearn.ipynb)
+- Create a TensorBoard callback when training a model.
+- Using TensorBoard with locally trained model.
+- Using Vertex AI TensorBoard with Vertex AI Training.
+
+[Get started with Vertex AI Training for R using R Kernel](community/ml_ops/stage2/get_started_vertex_training_r_using_r_kernel.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI`, using an R kernel, for training and deploying an R custom model.
 
-```
 The steps performed include:
-- Training using a Python package.
-- Report accuracy when hyperparameter tuning.
-- Save the model artifacts to Cloud Storage using GCSFuse.
-- Create a `Vertex AI Model` resource.
-```
 
-[Get started with Vertex AI Experiments](get_started_vertex_experiments.ipynb)
+- Create a custom R training script
+- Create a custom R serving script
+- Create a custom R deployment (serving) container.
+- Train the model using `Vertex AI` custom training.
+- Create an `Endpoint` resouce.
+- Deploy the `Model` resource (trained R model) to the `Endpoint` resource.
+- Make an online prediction.
+
+
+[Get started Vision API test preprocessing and AutoML text model generation](community/ml_ops/stage2/get_started_with_visionapi_and_automl.ipynb)
+
+In this tutorial, you create an `AutoML` text entity extraction model pre-existing extracted data by generating a custom import file. You deploy this mode for online prediction from a Python script using the `BigQuery`, `Vision AI`, Cloud Storage and `Vertex AI SDK` for Python. 
 
-```
 The steps performed include:
+
+- Preprocess training files using `Vision AI` APIs to extract the text from PDF files.
+- Create a custom import file that includes annotation data based on the sample `BigQuery` dataset.
+- Create a `Vertex AI Dataset` resource.
+- Train the model.
+- View the model evaluation.
+- Deploy the `Vertex AI Model` resource to a serving `Endpoint` resource.
+- Make a prediction.
+- Undeploy the `Model`.
+
+[Get started with Vertex AI Experiments](community/ml_ops/stage2/get_started_vertex_experiments.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Experiments` when training with `Vertex AI`.
+
+The steps performed include:
+
 - Local (notebook) Training
     - Create an experiment
     - Create a first run in the experiment
@@ -142,23 +214,23 @@ The steps performed include:
     - Create a `Vertex AI Training` custom job
     - Execute the custom job
     - Visualize the experiment results
-```
 
-[Get started with Vertex AI Hyperparameter Tuning for XGBoost](get_started_vertex_hpt_xgboost.ipynb)
+[AutoML Image Classfication Training with Customer Managed Encryption Keys (CMEK)](community/ml_ops/stage2/get_started_with_cmek_training.ipynb)
+
+In this tutorial, you learn how to use a customer managed encryption key (CMEK) for `Vertex AI AutoML` training.
 
-```
 The steps performed include:
-- Training using a Python package.
-- Report accuracy when hyperparameter tuning.
-- Save the model artifacts to Cloud Storage using GCSFuse.
-- Create a `Vertex AI Model` resource.
 
-```
+- Creating a customer managed encryption key.
+- Creating an image dataset with CMEK encryption.
+- Train an AutoML model with CMEK encryption.
 
-[Get started with Vertex AI Feature Store](get_started_vertex_feature_store.ipynb)
+[Get started with Vertex AI Feature Store](community/ml_ops/stage2/get_started_vertex_feature_store.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Feature Store` when training and predicting with `Vertex AI`.
 
-```
 The steps performed include:
+
 - Creating a Vertex AI `Featurestore` resource.
     - Creating `EntityType` resources for the `Featurestore` resource.
     - Creating `Feature` resources for each `EntityType` resource.
@@ -167,96 +239,26 @@ The steps performed include:
     - From a pandas DataFrame.
 - Perform online serving from a `Featurestore` resource.
 - Perform batch serving from a `Featurestore` resource.
-```
 
-[Get started with Vertex AI Training for R](get_started_vertex_training_r.ipynb)
+[Get started with AutoML Training](community/ml_ops/stage2/get_started_automl_training.ipynb)
+
+In this tutorial, you learn how to use `AutoML` for training with `Vertex AI`.
 
-```
 The steps performed include:
-- Locally train an R model in a notebook using %%R magic commands
-- Create a deployment image with trained R model and serving functions.
-- Test the deployment image locally.
-- Create a `Vertex AI Model` resource for the deployment image with embedded R model.
-- Deploy the deployment image with embedded R model to a `Vertex AI Endpoint` resource.
-- Test the deployment image with embedded R model.
-- Create a R-to-Python training package.
-- Create a training image for training the model.
-- Train a R model using `Vertex AI Trainingh` service with the R-to-Python training package.
-```
 
-[Get started with logging](get_started_with_logging.ipynb)
-
-```
-The steps performed include:
-- Use Python logging to log training configuration/results locally.
-- Use Google Cloud Logging to log training configuration/results in cloud storage.
-```
-
-[Get started with Vertex AI Training for R using R Kernel](get_started_vertex_training_r_using_r_kernel.ipynb)
-
-```
-The steps performed include:
-- Create a custom R training script
-- Create a custom R serving script
-- Create a custom R deployment (serving) container.
-- Train the model using `Vertex AI` custom training.
-- Create an `Endpoint` resouce.
-- Deploy the `Model` resource (trained R model) to the `Endpoint` resource.
-- Make an online prediction.
-
-```
-
-[Get started with BigQuery ML training](get_started_bqml_training.ipynb)
-
-```
-The steps performed include:
-- Create a local BigQuery table in your project
-- Train a BQML model
-- Evaluate the BQML model
-- Export the BQML model as a cloud model
-- Upload the exported model as a `Vertex AI Model` resource
-- Hyperparameter tune a BQML model with `Vertex AI Vizier`
-- Automatically register a BQML model to `Vertex AI Model Registry`
-
-```
-
-[Get started with AutoML training](get_started_automl_training.ipynb)
-
-```
-The steps performed include:
 - Train an image model
 - Export the image model as an edge model
 - Train a tabular model
 - Export the tabular model as a cloud model
 - Train a text model
 - Train a video model
-```
 
-[Get started with Vertex AI Training for XGBoost](get_started_vertex_training_xgboost.ipynb)
+[Get started with Vertex AI Training for LightGBM](community/ml_ops/stage2/get_started_vertex_training_lightgbm.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Training` for training a LightGBM custom model.
 
-```
 The steps performed include:
-- Training using a Python package.
-- Report accuracy when hyperparameter tuning.
-- Save the model artifacts to Cloud Storage using GCSFuse.
-- Create a `Vertex AI Model` resource.
 
-```
-
-[Get started with Vertex AI Training](get_started_vertex_training.ipynb)
-
-```
-The steps performed include:
-- Training using a single Python script.
-- Training using a Python package.
-- Training using a custom training image.
-- Laying out a training package.
-```
-
-[Get started with Vertex AI Training for LightGBM](get_started_vertex_training_lightgbm.ipynb)
-
-```
-The steps performed include:
 - Training using a Python package.
 - Save the model artifacts to Cloud Storage using GCSFuse.
 - Construct a FastAPI prediction server.
@@ -264,21 +266,51 @@ The steps performed include:
 - Test the deployment image locally.
 - Create a `Vertex AI Model` resource.
 
-```
+[Get started with Vertex AI Training for Scikit-Learn](community/ml_ops/stage2/get_started_vertex_training_sklearn.ipynb)
 
-[Get started Vision API test preprocessing and AutoML text model generation](get_started_with_visionapi_and_automl.ipynb)
+In this tutorial, you learn how to use `Vertex AI Training` for training a Scikit-Learn custom model.
 
-```
 The steps performed include:
-- Preprocess training files using `Vision AI` APIs to extract the text from PDF files.
-- Create a custom import file that includes annotation data based on the sample `BigQuery` dataset.
-- Create a `Vertex AI Dataset` resource.
-- Train the model.
-- View the model evaluation.
-- Deploy the `Vertex AI Model` resource to a serving `Endpoint` resource.
-- Make a prediction.
-- Undeploy the `Model`.
-```
+
+- Training using a Python package.
+- Report accuracy when hyperparameter tuning.
+- Save the model artifacts to Cloud Storage using GCSFuse.
+- Create a `Vertex AI Model` resource.
+
+[Get started with Vertex AI Training](community/ml_ops/stage2/get_started_vertex_training.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Training` for custom models when training with `Vertex AI`.
+
+The steps performed include:
+
+- Training using a single Python script.
+- Training using a Python package.
+- Training using a custom training image.
+- Laying out a training package.
+
+
+[Get started with Vertex AI Training for Pytorch](community/ml_ops/stage2/get_started_vertex_training_pytorch.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Training` for training a Pytorch custom model.
+
+The steps performed include:
+
+- Single node training using a Python package.
+- Report accuracy when hyperparameter tuning.
+- Save the model artifacts to Cloud Storage using GCSFuse.
+- Create a `Vertex AI Model` resource.
+
+[Get started with Vertex AI Distributed Training](community/ml_ops/stage2/get_started_vertex_distributed_training.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Distributed Training` for when training with `Vertex AI`.
+
+The steps performed include:
+
+- `MirroredStrategy`: Train on a single VM with multiple GPUs.
+- `MultiWorkerMirroredStrategy`: Train on multiple VMs with automatic setup of replicas.
+- `MultiWorkerMirroredStrategy`: Train on multiple VMs with fine grain control of replicas.
+- `ReductionServer`: Train on multiple VMS and sync updates across VMS with `Vertex AI Reduction Server`.
+- `TPUTraining`: Train with multiple Cloud TPUs.
 
 ### E2E Stage Example
 

notebooks/community/ml_ops/stage2/get_started_vertex_vizier.ipynb

@@ -84,7 +84,8 @@
         "The steps performed include:\n",
         "\n",
         "- Hyperparameter tuning with Random algorithm.\n",
-        "- Hyperparameter tuning with Vizier (Bayesian) algorithm."
+        "- Hyperparameter tuning with Vizier (Bayesian) algorithm.\n",
+        "- Suggesting trials and updating results for Vizier study"
       ]
     },
     {
@@ -187,7 +188,8 @@
         "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
         "\n",
-        "! pip3 install --upgrade google-cloud-aiplatform[tensorboard] $USER_FLAG -q"
+        "! pip3 install --upgrade $USER_FLAG -q google-cloud-aiplatform \\\n",
+        "                                       google-vizier==0.0.4"
       ]
     },
     {
@@ -329,25 +331,32 @@
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "timestamp"
+        "id": "06571eb4063b"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "timestamp"
+        "id": "4e166d927e36"
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -358,7 +367,7 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. \n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -446,7 +455,7 @@
       "outputs": [],
       "source": [
         "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
-        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP"
+        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + UUID"
       ]
     },
     {
@@ -509,7 +518,8 @@
       },
       "outputs": [],
       "source": [
-        "import google.cloud.aiplatform as aip"
+        "import google.cloud.aiplatform as aip\n",
+        "from google.cloud.aiplatform.vizier import Study, pyvizier"
       ]
     },
     {
@@ -534,35 +544,6 @@
         "aip.init(project=PROJECT_ID, staging_bucket=BUCKET_URI)"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "aip_constants"
-      },
-      "source": [
-        "#### Vertex AI constants\n",
-        "\n",
-        "Setup up the following constants for Vertex AI:\n",
-        "\n",
-        "- `API_ENDPOINT`: The Vertex AI API service endpoint for `Dataset`, `Model`, `Job`, `Pipeline` and `Endpoint` services.\n",
-        "- `PARENT`: The Vertex AI location root path for `Dataset`, `Model`, `Job`, `Pipeline` and `Endpoint` resources."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "aip_constants"
-      },
-      "outputs": [],
-      "source": [
-        "# API service endpoint\n",
-        "API_ENDPOINT = \"{}-aiplatform.googleapis.com\".format(REGION)\n",
-        "\n",
-        "# Vertex location root path for your dataset, model and endpoint resources\n",
-        "PARENT = \"projects/\" + PROJECT_ID + \"/locations/\" + REGION"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -626,7 +607,7 @@
         "if os.getenv(\"IS_TESTING_TF\"):\n",
         "    TF = os.getenv(\"IS_TESTING_TF\")\n",
         "else:\n",
-        "    TF = \"2.1\".replace(\".\", \"-\")\n",
+        "    TF = \"2.5\".replace(\".\", \"-\")\n",
         "\n",
         "if TF[0] == \"2\":\n",
         "    if TRAIN_GPU:\n",
@@ -1031,7 +1012,7 @@
       },
       "outputs": [],
       "source": [
-        "JOB_NAME = \"custom_job_\" + TIMESTAMP\n",
+        "JOB_NAME = \"custom_job_\" + UUID\n",
         "MODEL_DIR = \"{}/{}\".format(BUCKET_URI, JOB_NAME)\n",
         "\n",
         "if not TRAIN_NGPU or TRAIN_NGPU < 2:\n",
@@ -1094,9 +1075,7 @@
       },
       "outputs": [],
       "source": [
-        "job = aip.CustomJob(\n",
-        "    display_name=\"boston_\" + TIMESTAMP, worker_pool_specs=worker_pool_spec\n",
-        ")"
+        "job = aip.CustomJob(display_name=\"boston_\" + UUID, worker_pool_specs=worker_pool_spec)"
       ]
     },
     {
@@ -1128,7 +1107,7 @@
         "from google.cloud.aiplatform import hyperparameter_tuning as hpt\n",
         "\n",
         "hpt_job = aip.HyperparameterTuningJob(\n",
-        "    display_name=\"boston_\" + TIMESTAMP,\n",
+        "    display_name=\"boston_\" + UUID,\n",
         "    custom_job=job,\n",
         "    metric_spec={\n",
         "        \"val_loss\": \"minimize\",\n",
@@ -1309,7 +1288,7 @@
       "outputs": [],
       "source": [
         "job = aip.CustomJob(\n",
-        "    display_name=\"boston_\" + TIMESTAMP,\n",
+        "    display_name=\"boston_\" + UUID,\n",
         "    worker_pool_specs=worker_pool_spec,\n",
         "    base_output_dir=MODEL_DIR,\n",
         ")"
@@ -1344,7 +1323,7 @@
         "from google.cloud.aiplatform import hyperparameter_tuning as hpt\n",
         "\n",
         "hpt_job = aip.HyperparameterTuningJob(\n",
-        "    display_name=\"boston_\" + TIMESTAMP,\n",
+        "    display_name=\"boston_\" + UUID,\n",
         "    custom_job=job,\n",
         "    metric_spec={\n",
         "        \"val_loss\": \"minimize\",\n",
@@ -1513,22 +1492,25 @@
         "id": "vizier_client"
       },
       "source": [
-        "### Create Vizier client\n",
+        "### Specify the algorithm used to suggest trial parameters\n",
         "\n",
-        "Create a client side connection to the Vertex AI Vizier service."
+        "First, you create a `StudyConfig`, and specify the algorithm to suggest the next trial.\n",
+        "\n",
+        "    GRID_SEARCH: grid search\n",
+        "    RANDOM_SEARCH: random search\n",
+        "    ALGORIGTHM_UNSPECIFIED: Vizier bayesian algorithm"
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "vizier_client"
+        "id": "d7dd26490358"
       },
       "outputs": [],
       "source": [
-        "vizier_client = aip.gapic.VizierServiceClient(\n",
-        "    client_options=dict(api_endpoint=API_ENDPOINT)\n",
-        ")"
+        "problem = pyvizier.StudyConfig()\n",
+        "problem.algorithm = pyvizier.Algorithm.RANDOM_SEARCH"
       ]
     },
     {
@@ -1543,7 +1525,15 @@
         "\n",
         "In the following example, the goal is to maximize y = x^2 with x in the range of \\[-10. 10\\]. This example has only one parameter and uses an easily calculated function to help demonstrate how to use Vizier.\n",
         "\n",
-        "First, you will create the study using the `create_study()` method."
+        "First, you specify the metrics to minimize or maximize in the study as a list to the property `metric_information`. Then you specify the parameters to the study using the `add_XXX_params()` method for the corresponding data type:\n",
+        "\n",
+        "    - add_bool_param\n",
+        "    - add_categorical_param\n",
+        "    - add_discrete_param\n",
+        "    - add_float_param\n",
+        "    - add_int_param\n",
+        "\n",
+        "You create the study using the `create_or_load()` method."
       ]
     },
     {
@@ -1554,28 +1544,19 @@
       },
       "outputs": [],
       "source": [
-        "STUDY_DISPLAY_NAME = \"xpow2\" + TIMESTAMP\n",
+        "STUDY_DISPLAY_NAME = \"xpow2\" + UUID\n",
         "\n",
-        "param_x = {\n",
-        "    \"parameter_id\": \"x\",\n",
-        "    \"double_value_spec\": {\"min_value\": -10.0, \"max_value\": 10.0},\n",
-        "}\n",
+        "problem.metric_information.append(\n",
+        "    pyvizier.MetricInformation(name=\"y\", goal=pyvizier.ObjectiveMetricGoal.MAXIMIZE)\n",
+        ")\n",
         "\n",
-        "metric_y = {\"metric_id\": \"y\", \"goal\": \"MAXIMIZE\"}\n",
+        "params = problem.search_space.select_root()\n",
+        "params.add_float_param(\"x\", -10.0, 10.0, scale_type=pyvizier.ScaleType.LINEAR)\n",
         "\n",
-        "study = {\n",
-        "    \"display_name\": STUDY_DISPLAY_NAME,\n",
-        "    \"study_spec\": {\n",
-        "        \"algorithm\": \"RANDOM_SEARCH\",\n",
-        "        \"parameters\": [param_x],\n",
-        "        \"metrics\": [metric_y],\n",
-        "    },\n",
-        "}\n",
+        "study = Study.create_or_load(display_name=STUDY_DISPLAY_NAME, problem=problem)\n",
         "\n",
-        "study = vizier_client.create_study(parent=PARENT, study=study)\n",
         "STUDY_NAME = study.name\n",
-        "\n",
-        "print(STUDY_NAME)"
+        "print(\"STUDY_NAME: {}\".format(STUDY_NAME))"
       ]
     },
     {
@@ -1586,9 +1567,7 @@
       "source": [
         "### Get Vizier study\n",
         "\n",
-        "You can get a study using the method `get_study()`, with the following key/value pairs:\n",
-        "\n",
-        "- `name`: The name of the study."
+        "You can get a study using the method `list()`."
       ]
     },
     {
@@ -1599,9 +1578,8 @@
       },
       "outputs": [],
       "source": [
-        "study = vizier_client.get_study({\"name\": STUDY_NAME})\n",
-        "\n",
-        "print(study)"
+        "studies = Study.list()\n",
+        "print(studies[0].gca_resource)"
       ]
     },
     {
@@ -1612,11 +1590,9 @@
       "source": [
         "### Get suggested trial\n",
         "\n",
-        "Next, query the Vizier service for a suggested trial(s) using the method `suggest_trials`, with the following key/value pairs:\n",
+        "Next, query the Vizier service for a suggested trial(s) using the method `suggest()`, with the following key/value pairs:\n",
         "\n",
-        "- `parent`: The name of the study.\n",
-        "- `suggestion_count`: The number of trials to suggest.\n",
-        "- `client_id`: blah\n",
+        "- `count`: The number of trials to suggest.\n",
         "\n",
         "This call is a long running operation. The method `result()` from the response object will wait until the call has completed."
       ]
@@ -1625,18 +1601,13 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "vizier_suggest_trial"
+        "id": "11ff2c4562cb"
       },
       "outputs": [],
       "source": [
         "SUGGEST_COUNT = 1\n",
-        "CLIENT_ID = \"1001\"\n",
         "\n",
-        "response = vizier_client.suggest_trials(\n",
-        "    {\"parent\": STUDY_NAME, \"suggestion_count\": SUGGEST_COUNT, \"client_id\": CLIENT_ID}\n",
-        ")\n",
-        "\n",
-        "trials = response.result().trials\n",
+        "trials = study.suggest(count=SUGGEST_COUNT)\n",
         "\n",
         "print(trials)\n",
         "\n",
@@ -1679,12 +1650,10 @@
       "source": [
         "RESULT = 0.01\n",
         "\n",
-        "vizier_client.add_trial_measurement(\n",
-        "    {\n",
-        "        \"trial_name\": TRIAL_ID,\n",
-        "        \"measurement\": {\"metrics\": [{\"metric_id\": \"y\", \"value\": RESULT}]},\n",
-        "    }\n",
-        ")"
+        "measurement = pyvizier.Measurement()\n",
+        "measurement.metrics[\"y\"] = RESULT\n",
+        "\n",
+        "trials[0].add_measurement(measurement)"
       ]
     },
     {
@@ -1695,7 +1664,7 @@
       "source": [
         "### Delete the Vizier study\n",
         "\n",
-        "The method 'delete_study()' will delete the study."
+        "The method 'delete()' will delete the study."
       ]
     },
     {
@@ -1706,7 +1675,7 @@
       },
       "outputs": [],
       "source": [
-        "vizier_client.delete_study({\"name\": STUDY_NAME})"
+        "study.delete()"
       ]
     },
     {

notebooks/community/ml_ops/stage2/get_started_with_logging.ipynb

@@ -73,7 +73,7 @@
       "source": [
         "### Objective\n",
         "\n",
-        "In this tutorial, you learn how to use Python and Cloud logging awhen training with `Vertex AI`.\n",
+        "In this tutorial, you learn how to use Python and Cloud logging when training with `Vertex AI`.\n",
         "\n",
         "This tutorial uses the following Google Cloud ML services:\n",
         "\n",

notebooks/community/ml_ops/stage2/mlops_experimentation.ipynb

@@ -39,18 +39,15 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "        <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage2/mlops_experimentation.ipynb\">\n",
-        "        <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
-        "        </a>\n",
-        "  </td>\n",
-        "  <td>\n",
         "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/ml_ops/stage2/mlops_experimentation.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
         "  </td>\n",
         "</table>\n",
-        "<br/><br/><br/>"
+        "<br/><br/><br/>\n",
+        "\n",
+        "*Note: This notebook is not supported for execution in Colab*"
       ]
     },
     {
@@ -216,20 +213,18 @@
         "\n",
         "ONCE_ONLY = False\n",
         "if ONCE_ONLY:\n",
-        "    ! pip3 install -U tensorflow==2.5 $USER_FLAG -q\n",
-        "    ! pip3 install -U tensorflow-data-validation==1.2 $USER_FLAG -q\n",
-        "    ! pip3 install -U tensorflow-transform==1.2 $USER_FLAG -q\n",
-        "    ! pip3 install -U tensorflow-io==0.18 $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-aiplatform[tensorboard] $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-pipeline-components $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-bigquery $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade google-cloud-logging $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade apache-beam[gcp] $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade pyarrow $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade cloudml-hypertune $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade kfp $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade torchvision $USER_FLAG -q\n",
-        "    ! pip3 install --upgrade rpy2 $USER_FLAG -q"
+        "    ! pip3 install -U {USER_FLAG} -q tensorflow==2.5 \\\n",
+        "                                     tensorflow-data-validation==1.2 \\\n",
+        "                                     tensorflow-transform==1.2 \\\n",
+        "                                     tensorflow-io==0.18 \n",
+        "    \n",
+        "    ! pip3 install --upgrade {USER_FLAG} -q google-cloud-aiplatform[tensorboard] \\\n",
+        "                                            google-cloud-pipeline-components \\\n",
+        "                                            google-cloud-bigquery \\\n",
+        "                                            google-cloud-logging \\\n",
+        "                                            apache-beam[gcp] \\\n",
+        "                                            pyarrow \\\n",
+        "                                            cloudml-hypertune"
       ]
     },
     {
@@ -444,12 +439,11 @@
         "import sys\n",
         "\n",
         "# If on Vertex AI Workbench, then don't execute this code\n",
-        "IS_COLAB = False\n",
+        "IS_COLAB = \"google.colab\" in sys.modules\n",
         "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
         "    \"DL_ANACONDA_HOME\"\n",
         "):\n",
         "    if \"google.colab\" in sys.modules:\n",
-        "        IS_COLAB = True\n",
         "        from google.colab import auth as google_auth\n",
         "\n",
         "        google_auth.authenticate_user()\n",

notebooks/community/ml_ops/stage3/README.md

@@ -33,10 +33,144 @@ The third stage in MLOps is formalization to develop an automated pipeline proce
 
 ### Get Started
 
-[Get started with AutoML Tabular Pipeline Workflows](get_started_with_automl_tabular_pipeline_workflow.ipynb)
 
-```
+[Get started with Vertex AI Model Registry](community/ml_ops/stage3/get_started_with_model_registry.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Model Registry` to create and register multiple versions of a model.
+
 The steps performed include:
+
+- Create and register a first version of a model to `Vertex AI Model Registry`.
+- Create and register a second version of a model to `Vertex AI Model Registry`.
+- Updating the model version which is the default (blessed).
+- Deleting a model version.
+- Retraining the next model version.
+
+[Get started with Dataflow pipeline components](community/ml_ops/stage3/get_started_with_dataflow_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Dataflow`.
+
+The steps performed include:
+
+- Build an Apache Beam data pipeline.
+- Encapsulate the Apache Beam data pipeline with a Dataflow component in a Vertex AI pipeline.
+- Execute a Vertex AI pipeline.
+
+[Get started with Apache Airflow and Vertex AI Pipelines](community/ml_ops/stage3/get_started_with_airflow_and_vertex_pipelines.ipynb)
+
+In this tutorial, you learn how to use Apache Airflow with `Vertex AI Pipelines`.
+
+The steps performed include:
+
+- Create Cloud Composer environment.
+- Upload Airflow DAG to Composer environment that performs data processing -- i.e., creates a BigQuery table from a CSV file.
+- Create a `Vertex AI Pipeline` that triggers the Airflow DAG.
+- Execute the `Vertex AI Pipeline`.
+
+[Get started with Kubeflow Pipelines](community/ml_ops/stage3/get_started_with_kubeflow_pipelines.ipynb)
+
+In this tutorial, you learn how to use `Kubeflow Pipelines`(KFP).
+
+The steps performed include:
+
+- Building KFP lightweight Python function components.
+- Assembling and compiling KFP components into a pipeline.
+- Executing a KFP pipeline using Vertex AI Pipelines.
+- Loading component and pipeline definitions from a source code repository.
+- Building sequential, parallel, multiple output components.
+- Building control flow into pipelines.
+
+[Get started with Vertex AI custom training pipeline components](community/ml_ops/stage3/get_started_with_custom_training_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Vertex AI Training`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Training a Vertex AI custom trained model.
+    - Test the serving binary with a batch prediction job.
+    - Deploying a Vertex AI custom trained model.
+- Execute a Vertex AI pipeline.
+- Construct a pipeline for:
+     - Construct a custom training component.
+     - Convert custom training component to CustomTrainingJobOp.
+     - Training a Vertex AI custom trained model using the converted component.
+    - Deploying a Vertex AI custom trained model.
+- Execute a Vertex AI pipeline.
+
+[Get started with Dataproc Serverless pipeline components](community/ml_ops/stage3/get_started_with_dataproc_serverless_pipeline_components.ipynb)
+
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Dataproc Serverless` service. 
+
+
+The steps performed include:
+
+- `DataprocPySparkBatchOp` for running PySpark batch workloads.
+- `DataprocSparkBatchOp` for running Spark batch workloads.
+- `DataprocSparkSqlBatchOp` for running Spark SQL batch workloads.
+- `DataprocSparkRBatchOp` for running SparkR batch workloads.
+
+[Get started with Vertex AI Hyperparameter Tuning pipeline components](community/ml_ops/stage3/get_started_with_hpt_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Vertex AI Hyperparameter Tuning`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Hyperparameter tune/train a custom model.
+    - Retrieve the tuned hyperparameter values and metrics to optimize.
+    - If the metrics exceed a specified threshold.
+      - Get the location of the model artifacts for the best tuned model.
+      - Upload the model artifacts to a `Vertex AI Model` resource.
+- Execute a Vertex AI pipeline.
+
+[Get started with machine management for Vertex AI Pipelines](community/ml_ops/stage3/get_started_with_machine_management.ipynb)
+
+In this tutorial, you convert a self-contained custom training component into a `Vertex AI CustomJob`, whereby:
+
+    - The training job and artifacts are trackable.
+    - Set machine resources, such as machine-type, cpu/gpu, memory, disk, etc.
+
+The steps performed in this tutorial include:
+
+- Create a custom component with a self-contained training job.
+- Execute pipeline using component-level settings for machine resources
+- Convert the self-contained training component into a `Vertex AI CustomJob`.
+- Execute pipeline using customjob-level settings for machine resources 
+
+[Get started with TFX pipelines](community/ml_ops/stage3/get_started_with_tfx_pipeline.ipynb)
+
+In this tutorial, you learn how to use TensorFlow Extended (TFX) with `Vertex AI Pipelines`.
+
+The steps performed include:
+
+- Create a TFX e2e pipeline.
+- Execute the pipeline locally.
+- Execute the pipeline on Google Cloud using `Vertex AI Training`
+- Execute the pipeline using `Vertex AI Pipelines`.
+
+[Get started with BigQuery ML pipeline components](community/ml_ops/stage3/get_started_with_bqml_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `BigQuery ML`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Training BigQuery ML model.
+    - Evaluating the BigQuery ML model.
+    - Exporting the BigQuery ML model.
+    - Importing the BigQuery ML model to a Vertex AI model.
+    - Deploy the Vertex AI model.
+- Execute a Vertex AI pipeline.
+- Make a prediction with the deployed Vertex AI model.
+
+[Get started with AutoML tabular pipeline workflows](community/ml_ops/stage3/get_started_with_automl_tabular_pipeline_workflow.ipynb)
+
+In this tutorial, you learn how to use `AutoML Tabular Pipeline Template` for training, exporting and tuning an AutoML tabular model.
+
+The steps performed include:
+
 - Define training specification.
     - Dataset specification
     - Hyperparameter overide specification
@@ -49,162 +183,41 @@ The steps performed include:
 - Deploy exported OSS TF model.
 - Make a prediction.
 
-```
+[Get started with rapid prototyping with AutoML and BigQuery ML](community/ml_ops/stage3/get_started_with_rapid_prototyping_bqml_automl.ipynb)
 
-[Get started with Vertex AI Model Registry](get_started_with_model_registry.ipynb)
+In this tutorial, you learn how to use `Vertex AI Predictions` for rapid prototyping a model.
 
-```
 The steps performed include:
-- Create and register a first version of a model to `Vertex AI Model Registry`.
-- Create and register a second version of a model to `Vertex AI Model Registry`.
-- Updating the model version which is the default (blessed).
-- Deleting a model version.
-- Retraining the next model version.
-```
 
-[Get started with Dataproc serverless pipeline components](get_started_with_dataproc_serverless_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- `DataprocPySparkBatchOp` for running PySpark batch workloads.
-- `DataprocSparkBatchOp` for running Spark batch workloads.
-- `DataprocSparkSqlBatchOp` for running Spark SQL batch workloads.
-- `DataprocSparkRBatchOp` for running SparkR batch workloads.
-
-```
-
-[Get started with TFX pipelines](get_started_with_tfx_pipeline.ipynb)
-
-```
-The steps performed include:
-- Create a TFX e2e pipeline.
-- Execute the pipeline locally.
-- Execute the pipeline on Google Cloud using `Vertex AI Training`
-- Execute the pipeline using `Vertex AI Pipelines`.
-```
-
-[Get started with Vertex AI Hyperparameter Tuning pipeline components](get_started_with_hpt_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- Construct a pipeline for:
-    - Hyperparameter tune/train a custom model.
-    - Retrieve the tuned hyperparameter values and metrics to optimize.
-    - If the metrics exceed a specified threshold.
-      - Get the location of the model artifacts for the best tuned model.
-      - Upload the model artifacts to a `Vertex AI Model` resource.
-- Execute a Vertex AI pipeline.
-
-```
-
-[Get started with Apache Airflow and Vertex AI Pipelines](get_started_with_airflow_and_vertex_pipelines.ipynb)
-
-```
-The steps performed include:
-- Create Cloud Composer environment.
-- Upload Airflow DAG to Composer environment that performs data processing -- i.e., creates a BigQuery table from a CSV file.
-- Create a `Vertex AI Pipeline` that triggers the Airflow DAG.
-- Execute the `Vertex AI Pipeline`.
-
-```
-
-[Get started with Vertex AI custom training pipeline components](get_started_with_custom_training_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- Construct a pipeline for:
-    - Training a Vertex AI custom trained model.
-    - Test the serving binary with a batch prediction job.
-    - Deploying a Vertex AI custom trained model.
-- Execute a Vertex AI pipeline.
-- Construct a pipeline for:
-     - Construct a custom training component.
-     - Convert custom training component to CustomTrainingJobOp.
-     - Training a Vertex AI custom trained model using the converted component.
-    - Deploying a Vertex AI custom trained model.
-- Execute a Vertex AI pipeline.
-```
-
-[Get started with AutoML pipeline components](get_started_with_automl_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- Construct a pipeline for:
-    - Training a Vertex AI AutoML trained model.
-    - Test the serving binary with a batch prediction job.
-    - Deploying a Vertex AI AutoML trained model.
-- Execute a Vertex AI pipeline.
-
-```
-
-[Get started with Kubeflow pipelines](get_started_with_kubeflow_pipelines.ipynb)
-
-```
-The steps performed include:
-- Building KFP lightweight Python function components.
-- Assembling and compiling KFP components into a pipeline.
-- Executing a KFP pipeline using Vertex AI Pipelines.
-- Loading component and pipeline definitions from a source code repository.
-- Building sequential, parallel, multiple output components.
-- Building control flow into pipelines.
-
-```
-
-[Get started with machine management for Vertex AI Pipelines](get_started_with_machine_management.ipynb)
-
-```
-The steps performed in this tutorial include:
-- Create a custom component with a self-contained training job.
-- Execute pipeline using component-level settings for machine resources
-- Convert the self-contained training component into a `Vertex AI CustomJob`.
-- Execute pipeline using customjob-level settings for machine resources 
-
-```
-
-[Get started with BigQuery and TFDV pipeline components](get_started_with_bq_tfdv_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- Build and execute a pipeline component for creating a Vertex AI Tabular Dataset from a BigQuery table.
-- Build and execute a pipeline component for generating TFDV statistics and schema from a Vertex AI Tabular Dataset.
-- Execute a Vertex AI pipeline.
-```
-
-[Get started with Dataflow pipeline components](get_started_with_dataflow_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- Build an Apache Beam data pipeline.
-- Encapsulate the Apache Beam data pipeline with a Dataflow component in a Vertex AI pipeline.
-- Execute a Vertex AI pipeline.
-```
-
-[Get started with BigQuery ML pipeline components](get_started_with_bqml_pipeline_components.ipynb)
-
-```
-The steps performed include:
-- Construct a pipeline for:
-    - Training BigQuery ML model.
-    - Evaluating the BigQuery ML model.
-    - Exporting the BigQuery ML model.
-    - Importing the BigQuery ML model to a Vertex AI model.
-    - Deploy the Vertex AI model.
-- Execute a Vertex AI pipeline.
-- Make a prediction with the deployed Vertex AI model.
-```
-
-[Get started with rapid prototyping with AutoML and BigQuery ML](get_started_with_rapid_prototyping_bqml_automl.ipynb)
-
-```
-The steps performed include:
 - Creating a BigQuery and Vertex AI training dataset.
 - Training a BigQuery ML and AutoML model.
 - Extracting evaluation metrics from the BigQueryML and AutoML models.
 - Selecting the best trained model.
 - Deploying the best trained model.
 - Testing the deployed model infrastructure.
-```
 
+[Get started with AutoML pipeline components](community/ml_ops/stage3/get_started_with_automl_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Vertex AI AutoML`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Training a Vertex AI AutoML trained model.
+    - Test the serving binary with a batch prediction job.
+    - Deploying a Vertex AI AutoML trained model.
+- Execute a Vertex AI pipeline.
+
+
+[Get started with BigQuery and TFDV pipeline components](community/ml_ops/stage3/get_started_with_bq_tfdv_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use build lightweight Python components for BigQuery and TensorFlow Data Validation.
+
+The steps performed include:
+
+- Build and execute a pipeline component for creating a Vertex AI Tabular Dataset from a BigQuery table.
+- Build and execute a pipeline component for generating TFDV statistics and schema from a Vertex AI Tabular Dataset.
+- Execute a Vertex AI pipeline.
 
 ### E2E Stage Example
 

notebooks/community/ml_ops/stage3/get_started_with_machine_management.ipynb

@@ -81,7 +81,7 @@
       "source": [
         "### Objective\n",
         "\n",
-        "In this tutorial, you convert a self-contained custom training component into a `Vertex AI CustomJob`, whereby:\n",
+        "In this tutorial, you learn how to convert a self-contained custom training component into a `Vertex AI CustomJob`, whereby:\n",
         "\n",
         "    - The training job and artifacts are trackable.\n",
         "    - Set machine resources, such as machine-type, cpu/gpu, memory, disk, etc.\n",
@@ -569,7 +569,6 @@
       "source": [
         "import json\n",
         "\n",
-        "import numpy as np\n",
         "from google.cloud import aiplatform\n",
         "from google_cloud_pipeline_components.v1.custom_job import \\\n",
         "    create_custom_training_job_from_component\n",
@@ -797,7 +796,6 @@
         "    epochs: int,\n",
         ") -> str:\n",
         "    import numpy as np\n",
-        "    import tensorflow as tf\n",
         "\n",
         "    def get_data():\n",
         "        from tensorflow.keras.datasets import mnist\n",
@@ -904,7 +902,7 @@
         "        },\n",
         "    ).after(training_job_task)\n",
         "\n",
-        "    model_upload = ModelUploadOp(\n",
+        "    _ = ModelUploadOp(\n",
         "        project=project,\n",
         "        display_name=\"mnist_model\",\n",
         "        unmanaged_container_model=import_unmanaged_model_task.outputs[\"artifact\"],\n",
@@ -1180,7 +1178,7 @@
         "        },\n",
         "    ).after(training_job_task)\n",
         "\n",
-        "    model_upload = ModelUploadOp(\n",
+        "    _ = ModelUploadOp(\n",
         "        project=project,\n",
         "        display_name=\"mnist_model\",\n",
         "        unmanaged_container_model=import_unmanaged_model_task.outputs[\"artifact\"],\n",

notebooks/community/ml_ops/stage4/README.md

@@ -42,104 +42,192 @@ This stage may be done entirely by MLOps. We recommend:
 
 ### Get Started
 
-[Get started with Vertex Explainable AI](get_started_with_vertex_xai.ipynb)
 
-```
+[Get started with Vertex AI Model Registry](community/ml_ops/stage3/get_started_with_model_registry.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Model Registry` to create and register multiple versions of a model.
+
 The steps performed include:
-- Train an AutoML tabular model.
-    - Do a batch prediction with explanations.
-    - Do an online prediction with explanations.
-- Train an custom TensorFlow tabular model.
-    - Manually set configuration metadata.
-    - Do a batch prediction with explanations.
-    - Do an online prediction with explanations.
-    - Automatically set configuration metadata.
-- Train an custom TensorFlow image model.
-    - Manually set configuration metadata.
-    - Do a batch prediction with explanations.
-    - Do an online prediction with explanations.
-- Train an custom XGBoost tabular model.
-    - Manually set configuration metadata.
-    - Do an online prediction with explanations.
-- Train an custom scikit-learn tabular model.
-    - Manually set configuration metadata.
-    - Do an online prediction with explanations.
 
-```
+- Create and register a first version of a model to `Vertex AI Model Registry`.
+- Create and register a second version of a model to `Vertex AI Model Registry`.
+- Updating the model version which is the default (blessed).
+- Deleting a model version.
+- Retraining the next model version.
 
-[Get started with Google Artifact Registry](get_started_with_google_artifact_registry.ipynb)
+[Get started with Dataflow pipeline components](community/ml_ops/stage3/get_started_with_dataflow_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Dataflow`.
 
-```
 The steps performed include:
-- Creating a private Docker repository.
-- Tagging a container image, specific to the private Docker repository.
-- Pushing a container image to the private Docker repository.
-- Pulling a container image from the private Docker repository.
-- Deleting a private Docker repository.
-```
 
-[Get started with AutoML training and ML Metadata](get_started_with_vertex_ml_metadata_and_automl.ipynb)
+- Build an Apache Beam data pipeline.
+- Encapsulate the Apache Beam data pipeline with a Dataflow component in a Vertex AI pipeline.
+- Execute a Vertex AI pipeline.
+
+[Get started with Apache Airflow and Vertex AI Pipelines](community/ml_ops/stage3/get_started_with_airflow_and_vertex_pipelines.ipynb)
+
+In this tutorial, you learn how to use Apache Airflow with `Vertex AI Pipelines`.
 
-```
 The steps performed include:
-- Create a `Dataset` resource.
-- Create a corresponding `google.VertexDataset` artifact.
-- Train a model using `AutoML`.
-- Create a corresponding `google.VertexModel` artifact.
-- Create an `Endpoint` resource.
-- Create a corresponding `google.Endpoint` artifact.
-- Deploy the train model to the `Endpoint`.
-- Create an execution and context for the `AutoML` training job and deployment.
-- Add the corresponding artifacts and context to the execution.
-- Add artifact links (event) to the execution.
-- Display the execution graph.
-```
 
-[Get started with Vertex AI ML Metadata](get_started_with_vertex_ml_metadata.ipynb)
+- Create Cloud Composer environment.
+- Upload Airflow DAG to Composer environment that performs data processing -- i.e., creates a BigQuery table from a CSV file.
+- Create a `Vertex AI Pipeline` that triggers the Airflow DAG.
+- Execute the `Vertex AI Pipeline`.
+
+[Get started with Kubeflow Pipelines](community/ml_ops/stage3/get_started_with_kubeflow_pipelines.ipynb)
+
+In this tutorial, you learn how to use `Kubeflow Pipelines`(KFP).
 
-```
 The steps performed include:
-- Create a `Metadatastore` resource.
-- Create (record)/List an `Artifact`, with artifacts and metadata.
-- Create (record)/List an `Execution`.
-- Create (record)/List a `Context`.
-- Add `Artifact` to `Execution` as events.
-- Add `Execution` and `Artifact` into the `Context`
-- Delete `Artifact`, `Execution` and `Context`.
-- Create and run a `Vertex AI Pipeline` ML workflow to train and deploy a scikit-learn model.
-    - Create custom pipeline components that generate artifacts and metadata.
-    - Compare Vertex AI Pipelines runs.
-    - Trace the lineage for pipeline-generated artifacts.
-    - Query your pipeline run metadata.
-```
 
-[Get started with Vertex AI Model Evaluation](get_started_with_model_evaluation.ipynb)
+- Building KFP lightweight Python function components.
+- Assembling and compiling KFP components into a pipeline.
+- Executing a KFP pipeline using Vertex AI Pipelines.
+- Loading component and pipeline definitions from a source code repository.
+- Building sequential, parallel, multiple output components.
+- Building control flow into pipelines.
+
+[Get started with Vertex AI custom training pipeline components](community/ml_ops/stage3/get_started_with_custom_training_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Vertex AI Training`.
 
-```
 The steps performed include:
-- Evaluate an `AutoML` model.
-    - Train an `AutoML` image classification model.
-    - Retrieve the default evaluation metrics from training.
-    - Do a batch evaluation for a custom evaluation slice.
-- Evaluate a BigQuery ML model.
-    - Train a `BigQuery ML` tabular classification model.
-    - Retrieve the default evaluation metrics from training.
-    - Do a batch evaluation for a custom evaluation slice.
-- Evaluate a custom model.
-    - Do a batch evaluation for a custom evaluation slice.
-    - Add an evaluation to the `Model Registry` for the `Model` resource.
-- Evaluate an `AutoML` model.
-    - Train an `AutoML` image classification model.
-    - Retrieve the default evaluation metrics from training.
-    - Do a batch evaluation for a custom evaluation slice.
-- Evaluate a BigQuery ML model.
-    - Train a `BigQuery ML` tabular classification model.
-    - Retrieve the default evaluation metrics from training.
-    - Do a batch evaluation for a custom evaluation slice.
-- Evaluate a custom model.
-    - Do a batch evaluation for a custom evaluation slice.
-    - Add an evaluation to the `Model Registry` for the `Model` resource.
-```
+
+- Construct a pipeline for:
+    - Training a Vertex AI custom trained model.
+    - Test the serving binary with a batch prediction job.
+    - Deploying a Vertex AI custom trained model.
+- Execute a Vertex AI pipeline.
+- Construct a pipeline for:
+     - Construct a custom training component.
+     - Convert custom training component to CustomTrainingJobOp.
+     - Training a Vertex AI custom trained model using the converted component.
+    - Deploying a Vertex AI custom trained model.
+- Execute a Vertex AI pipeline.
+
+[Get started with Dataproc Serverless pipeline components](community/ml_ops/stage3/get_started_with_dataproc_serverless_pipeline_components.ipynb)
+
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Dataproc Serverless` service. 
+
+
+The steps performed include:
+
+- `DataprocPySparkBatchOp` for running PySpark batch workloads.
+- `DataprocSparkBatchOp` for running Spark batch workloads.
+- `DataprocSparkSqlBatchOp` for running Spark SQL batch workloads.
+- `DataprocSparkRBatchOp` for running SparkR batch workloads.
+
+[Get started with Vertex AI Hyperparameter Tuning pipeline components](community/ml_ops/stage3/get_started_with_hpt_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Vertex AI Hyperparameter Tuning`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Hyperparameter tune/train a custom model.
+    - Retrieve the tuned hyperparameter values and metrics to optimize.
+    - If the metrics exceed a specified threshold.
+      - Get the location of the model artifacts for the best tuned model.
+      - Upload the model artifacts to a `Vertex AI Model` resource.
+- Execute a Vertex AI pipeline.
+
+[Get started with machine management for Vertex AI Pipelines](community/ml_ops/stage3/get_started_with_machine_management.ipynb)
+
+In this tutorial, you convert a self-contained custom training component into a `Vertex AI CustomJob`, whereby:
+
+    - The training job and artifacts are trackable.
+    - Set machine resources, such as machine-type, cpu/gpu, memory, disk, etc.
+
+The steps performed in this tutorial include:
+
+- Create a custom component with a self-contained training job.
+- Execute pipeline using component-level settings for machine resources
+- Convert the self-contained training component into a `Vertex AI CustomJob`.
+- Execute pipeline using customjob-level settings for machine resources 
+
+[Get started with TFX pipelines](community/ml_ops/stage3/get_started_with_tfx_pipeline.ipynb)
+
+In this tutorial, you learn how to use TensorFlow Extended (TFX) with `Vertex AI Pipelines`.
+
+The steps performed include:
+
+- Create a TFX e2e pipeline.
+- Execute the pipeline locally.
+- Execute the pipeline on Google Cloud using `Vertex AI Training`
+- Execute the pipeline using `Vertex AI Pipelines`.
+
+[Get started with BigQuery ML pipeline components](community/ml_ops/stage3/get_started_with_bqml_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `BigQuery ML`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Training BigQuery ML model.
+    - Evaluating the BigQuery ML model.
+    - Exporting the BigQuery ML model.
+    - Importing the BigQuery ML model to a Vertex AI model.
+    - Deploy the Vertex AI model.
+- Execute a Vertex AI pipeline.
+- Make a prediction with the deployed Vertex AI model.
+
+[Get started with AutoML tabular pipeline workflows](community/ml_ops/stage3/get_started_with_automl_tabular_pipeline_workflow.ipynb)
+
+In this tutorial, you learn how to use `AutoML Tabular Pipeline Template` for training, exporting and tuning an AutoML tabular model.
+
+The steps performed include:
+
+- Define training specification.
+    - Dataset specification
+    - Hyperparameter overide specification
+    - machine specifications
+- Construct tabular workflow pipeline.
+- Compile and execute pipeline.
+- View evaluation metrics artifact.
+- Export AutoML model as an OSS TF model.
+- Create `Endpoint` resource.
+- Deploy exported OSS TF model.
+- Make a prediction.
+
+[Get started with rapid prototyping with AutoML and BigQuery ML](community/ml_ops/stage3/get_started_with_rapid_prototyping_bqml_automl.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Predictions` for rapid prototyping a model.
+
+The steps performed include:
+
+- Creating a BigQuery and Vertex AI training dataset.
+- Training a BigQuery ML and AutoML model.
+- Extracting evaluation metrics from the BigQueryML and AutoML models.
+- Selecting the best trained model.
+- Deploying the best trained model.
+- Testing the deployed model infrastructure.
+
+[Get started with AutoML pipeline components](community/ml_ops/stage3/get_started_with_automl_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use prebuilt `Google Cloud Pipeline Components` for `Vertex AI AutoML`.
+
+The steps performed include:
+
+- Construct a pipeline for:
+    - Training a Vertex AI AutoML trained model.
+    - Test the serving binary with a batch prediction job.
+    - Deploying a Vertex AI AutoML trained model.
+- Execute a Vertex AI pipeline.
+
+
+[Get started with BigQuery and TFDV pipeline components](community/ml_ops/stage3/get_started_with_bq_tfdv_pipeline_components.ipynb)
+
+In this tutorial, you learn how to use build lightweight Python components for BigQuery and TensorFlow Data Validation.
+
+The steps performed include:
+
+- Build and execute a pipeline component for creating a Vertex AI Tabular Dataset from a BigQuery table.
+- Build and execute a pipeline component for generating TFDV statistics and schema from a Vertex AI Tabular Dataset.
+- Execute a Vertex AI pipeline.
+
 ### E2E Stage Example
 
 Stage 4: Evaluation

notebooks/community/ml_ops/stage5/README.md

@@ -25,10 +25,12 @@ The fifth stage in MLOps is deployment to production of the blessed model, which
 ### Get Started
 
 
-[Get started with Vertex AI Endpoints](get_started_with_vertex_endpoints.ipynb)
+[Get started with Vertex AI Endpoints](community/ml_ops/stage5/get_started_with_vertex_endpoints.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Endpoint` resources.
 
-```
 The steps performed include:
+
 - Creating an `Endpoint` resource.
 - List all `Endpoint` resources.
 - List `Endpoint` resources by query filter.
@@ -43,39 +45,13 @@ The steps performed include:
 - Delete an `Endpoint` resource.
 - In pipeline: Create an `Endpoint` resource and deploy an existing `Model` resource to the `Endpoint` resource.
 - In pipeline: Deploy an existing `Model` resource to an existing `Endpoint` resource.
-```
 
-[Get started with configuring autoscaling for Vertex AI Endpoint deployment](get_started_with_autoscaling.ipynb)
+[Get started with Vertex AI Endpoint and shared VM](community/ml_ops/stage5/get_started_with_vertex_endpoint_and_shared_vm.ipynb)
+
+In this tutorial, you learn how to use deployment resource pools for deploying models. A deployment resouce pool provides one with the ability to co-host more than one model on the same (shared) VM.
 
-```
 The steps performed include:
-- Download a pretrained image classification model from TensorFlow Hub.
-- Upload the pretrained model as a `Model` resource.
-- Create an `Endpoint` resource.
-- Deploy `Model` resource for no-scaling (single node).
-- Deploy `Model` resource for manual scaling.
-- Deploy `Model` resource for auto-scaling.
-- Fine-tune scaling thresholds for CPU utilization.
-- Fine-tune scaling thresholds for GPU utilization.
-- Deploy mix of CPU and GPU model instances with auto-scaling to an `Endpoint` resource.
-```
 
-[Get started with Vertex AI Private Endpoints](get_started_with_vertex_private_endpoints.ipynb)
-
-```
-The steps performed include:
-- Creating a `Private Endpoint` resource.
-- Configure a VPC peering connection.
-- Configuring the serving binary of a `Model` resource for deployment to a `Private Endpoint` resource.
-- Deploying a `Model` resource to a `Private Endpoint` resource.
-- Send a prediction request to a `Private Endpoint`
-
-```
-
-[Get started with Vertex AI Endpoint and shared VM](get_started_with_vertex_endpoint_and_shared_vm.ipynb)
-
-```
-The steps performed include:
 - Upload a pre-trained image classification model as a `Model` resource (model A).
 - Upload a pre-trained text sentence encoder model as a `Model` resource (model B).
 - Create a shared VM deployment resource pool.
@@ -85,4 +61,36 @@ The steps performed include:
 - Deploy second model (model B) to second `Endpoint` resource using deployment resource pool.
 - Make a prediction request with first deployed model (model A).
 - Make a prediction request with second deployed model (model B).
-```
+
+[Get started with configuring autoscaling for Vertex AI Endpoint deployment](community/ml_ops/stage5/get_started_with_autoscaling.ipynb)
+
+In this tutorial, you learn how to use fine-tune control auto-scaling configuration when deploying a `Model` resource to an `Endpoint` resource.
+
+The steps performed include:
+
+- Download a pretrained image classification model from TensorFlow Hub.
+- Upload the pretrained model as a `Model` resource.
+- Create an `Endpoint` resource.
+- Deploy `Model` resource for no-scaling (single node).
+- Deploy `Model` resource for manual scaling.
+- Deploy `Model` resource for auto-scaling.
+- Fine-tune scaling thresholds for CPU utilization.
+- Fine-tune scaling thresholds for GPU utilization.
+- Deploy mix of CPU and GPU model instances with auto-scaling to an `Endpoint` resource.
+
+[Get started with Vertex AI Private Endpoints](community/ml_ops/stage5/get_started_with_vertex_private_endpoints.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Private Endpoint` resources.
+
+The steps performed include:
+
+- Creating a `Private Endpoint` resource.
+- Configure a VPC peering connection.
+- Configuring the serving binary of a `Model` resource for deployment to a `Private Endpoint` resource.
+- Deploying a `Model` resource to a `Private Endpoint` resource.
+- Send a prediction request to a `Private Endpoint`
+- Enable two additional APIs: Service Networking and Cloud DNS.
+- Add Compute Admin Network role to your (default) service account.
+- Issue two gcloud commands to setup the VPC peering for your service account.
+- There is *currently* no SDK support yet, so private endpoint is created with GAPIC client and has an extra argument for the peering network.
+- To send a request, you can't use SDK/GAPIC since they do a HTTP internet request. Instead, you use curl to send a peer-to-peer request.

notebooks/community/ml_ops/stage5/get_started_with_vertex_endpoints.ipynb

@@ -340,7 +340,7 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. \n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -376,12 +376,11 @@
         "import sys\n",
         "\n",
         "# If on Vertex AI Workbench, then don't execute this code\n",
-        "IS_COLAB = False\n",
+        "IS_COLAB = \"google.colab\" in sys.modules\n",
         "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
         "    \"DL_ANACONDA_HOME\"\n",
         "):\n",
         "    if \"google.colab\" in sys.modules:\n",
-        "        IS_COLAB = True\n",
         "        from google.colab import auth as google_auth\n",
         "\n",
         "        google_auth.authenticate_user()\n",
@@ -428,8 +427,9 @@
       },
       "outputs": [],
       "source": [
-        "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
-        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP"
+        "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
+        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + TIMESTAMP\n",
+        "    BUCKET_URI = f\"gs://{BUCKET_NAME}\""
       ]
     },
     {
@@ -785,7 +785,7 @@
       },
       "outputs": [],
       "source": [
-        "endpoint.gca_resource"
+        "print(endpoint.gca_resource)"
       ]
     },
     {
@@ -908,7 +908,7 @@
       },
       "outputs": [],
       "source": [
-        "endpoint.gca_resource.deployed_models[0]"
+        "print(endpoint.gca_resource.deployed_models[0])"
       ]
     },
     {
@@ -1203,12 +1203,10 @@
         "\n",
         "In this pipeline, you create an `Endpoint` resource, and then you deploy a `Model` resource to the `Endpoint` resource. The `Model` resource  to deploy is your existing TFHub model which you previously imported as a `Model` resource. The steps are:\n",
         "\n",
-        "- For pipeline parameters, pass the resource name and resource URI for the existing `Model` resource.\n",
-        "- Use the `importer_node()` component to create a `VertexModel` pipeline artifact for the model.\n",
+        "- For pipeline parameters, pass the resource name for the existing `Model` resource.\n",
+        "- Use the `GetVertexModelOp()` component to create a `VertexModel` pipeline artifact for the model.\n",
         "- Create an `Endpoint` resource.\n",
-        "- Using the `VertexModel` pipeline artifact, deploy the `Model` resource to the `Endpoint` resource.\n",
-        "\n",
-        "*Note:* This example currently blocked by internal issue: b/219835305"
+        "- Using the `VertexModel` pipeline artifact, deploy the `Model` resource to the `Endpoint` resource."
       ]
     },
     {
@@ -1225,20 +1223,6 @@
         "\n",
         "PIPELINE_ROOT = \"{}/pipeline_root/endpoint_example\".format(BUCKET_URI)\n",
         "\n",
-        "# (WORKAROUND  b/219835305)\n",
-        "@component(\n",
-        "    base_image=\"python:3.9\",\n",
-        "    packages_to_install=[\"google-cloud-aiplatform\"],\n",
-        ")\n",
-        "def return_unmanaged_model(\n",
-        "    serving_image: str, artifact_uri: str, resource_name: str, model: Output[Artifact]\n",
-        "):\n",
-        "    model.metadata[\"containerSpec\"] = {\"imageUri\": serving_image}\n",
-        "\n",
-        "    model.metadata[\"resourceName\"] = resource_name\n",
-        "\n",
-        "    model.uri = artifact_uri\n",
-        "\n",
         "\n",
         "@dsl.pipeline(\n",
         "    name=\"create-endpoint-deploy-model\",\n",
@@ -1246,34 +1230,16 @@
         ")\n",
         "def pipeline(\n",
         "    display_name: str,\n",
-        "    resource_uri: str,\n",
         "    resource_name: str,\n",
-        "    # Model properties (WORKAROUND  b/219835305)\n",
-        "    serving_image: str,\n",
-        "    artifact_uri: str,\n",
         "    project: str = PROJECT_ID,\n",
         "    region: str = REGION,\n",
         "):\n",
-        "    from google_cloud_pipeline_components.types import artifact_types\n",
+        "    from google_cloud_pipeline_components.experimental.evaluation import \\\n",
+        "        GetVertexModelOp\n",
         "    from google_cloud_pipeline_components.v1.endpoint import (EndpointCreateOp,\n",
         "                                                              ModelDeployOp)\n",
-        "    from kfp.v2.components import importer_node\n",
         "\n",
-        "    # Desired sequence: blocked by b/219835305\n",
-        "    \"\"\"\n",
-        "    model = importer_node.importer(\n",
-        "        artifact_uri=resource_uri,\n",
-        "        artifact_class=artifact_types.VertexModel,\n",
-        "        metadata={\"resourceName\": resource_name},\n",
-        "    )\n",
-        "    \"\"\"\n",
-        "\n",
-        "    # (WORKAROUND  b/219835305)\n",
-        "    model = return_unmanaged_model(\n",
-        "        serving_image=serving_image,\n",
-        "        artifact_uri=artifact_uri,\n",
-        "        resource_name=resource_name,\n",
-        "    )\n",
+        "    model = GetVertexModelOp(model_resource_name=resource_name)\n",
         "\n",
         "    endpoint_op = EndpointCreateOp(\n",
         "        project=project,\n",
@@ -1281,7 +1247,7 @@
         "        display_name=display_name,\n",
         "    )\n",
         "\n",
-        "    deploy_op = ModelDeployOp(\n",
+        "    _ = ModelDeployOp(\n",
         "        model=model.outputs[\"model\"],\n",
         "        endpoint=endpoint_op.outputs[\"endpoint\"],\n",
         "        dedicated_resources_min_replica_count=1,\n",
@@ -1310,7 +1276,6 @@
         "\n",
         "- `display_name`: The display name for the generated Vertex AI resources.\n",
         "- `resource_name`: The resource name of the existing `Model` resource.\n",
-        "- `resource_uri`: The resource uri of the existing `Model` resource.\n",
         "- `project`: The project ID.\n",
         "- `region`: The region."
       ]
@@ -1323,10 +1288,6 @@
       },
       "outputs": [],
       "source": [
-        "# Model properties (WORKAROUND  b/219835305)\n",
-        "SERVING_CONTAINER_URI = model.gca_resource.container_spec.image_uri\n",
-        "ARTIFACT_URI = model.gca_resource.artifact_uri\n",
-        "\n",
         "try:\n",
         "    pipeline = aip.PipelineJob(\n",
         "        display_name=\"create-endpoint-deploy-pipeline\",\n",
@@ -1335,11 +1296,6 @@
         "        parameter_values={\n",
         "            \"display_name\": \"create_endpoint_and_deploy_model_\" + TIMESTAMP,\n",
         "            \"resource_name\": model.resource_name,\n",
-        "            \"resource_uri\": \"https://us-central1-aiplatform.googleapis.com/v1/\"\n",
-        "            + model.resource_name,\n",
-        "            # Model properties (WORKAROUND  b/219835305)\n",
-        "            \"serving_image\": SERVING_CONTAINER_URI,\n",
-        "            \"artifact_uri\": ARTIFACT_URI,\n",
         "            \"project\": PROJECT_ID,\n",
         "            \"region\": REGION,\n",
         "        },\n",
@@ -1488,7 +1444,7 @@
         "\n",
         "- For pipeline parameters, pass the resource names and resource URIs for the existing `Model` and `Endpoint` resource.\n",
         "- Use the `importer_node()` component to create a `VertexModel` pipeline artifact for the model.\n",
-        "- Use the `importer_node()` component to create a `VertexEndpoint` pipeline artifact for the endpoint.\n",
+        "- Use the `GetVertexModelOp()` component to create a `VertexModel` pipeline artifact for the model.\n",
         "- Using the `VertexModel` and `VertexEndpoint` pipeline artifacts, deploy the `Model` resource to the `Endpoint` resource.\n",
         "\n",
         "*Note:* This example currently blocked by internal issue: b/219835305"
@@ -1504,6 +1460,7 @@
       "source": [
         "PIPELINE_ROOT = \"{}/pipeline_root/endpoint_example_2\".format(BUCKET_URI)\n",
         "\n",
+        "\n",
         "# (WORKAROUND  b/219835305)\n",
         "@component(\n",
         "    base_image=\"python:3.9\",\n",
@@ -1520,35 +1477,23 @@
         ")\n",
         "def pipeline(\n",
         "    display_name: str,\n",
-        "    model_resource_uri: str,\n",
         "    model_resource_name: str,\n",
         "    endpoint_resource_uri: str,\n",
         "    endpoint_resource_name: str,\n",
-        "    # Model properties (WORKAROUND  b/219835305)\n",
-        "    serving_image: str,\n",
-        "    artifact_uri: str,\n",
         "    project: str = PROJECT_ID,\n",
         "    region: str = REGION,\n",
         "):\n",
-        "    from google_cloud_pipeline_components.types import artifact_types\n",
+        "    from google_cloud_pipeline_components.experimental.evaluation import \\\n",
+        "        GetVertexModelOp\n",
         "    from google_cloud_pipeline_components.v1.endpoint import ModelDeployOp\n",
-        "    from kfp.v2.components import importer_node\n",
         "\n",
         "    # Desired sequence: blocked by b/219835305\n",
         "    \"\"\"\n",
-        "    model = importer_node.importer(\n",
-        "        artifact_uri=resource_uri,\n",
-        "        artifact_class=artifact_types.VertexModel,\n",
-        "        metadata={\"resourceName\": resource_name},\n",
-        "    )\n",
+        "    from kfp.v2.components import importer_node\n",
+        "    from google_cloud_pipeline_components.types import artifact_types\n",
         "    \"\"\"\n",
         "\n",
-        "    # (WORKAROUND  b/219835305)\n",
-        "    model = return_unmanaged_model(\n",
-        "        serving_image=serving_image,\n",
-        "        artifact_uri=artifact_uri,\n",
-        "        resource_name=model_resource_name,\n",
-        "    )\n",
+        "    model = GetVertexModelOp(model_resource_name=model_resource_name)\n",
         "\n",
         "    # Desired sequence: blocked by b/219835305\n",
         "    \"\"\"\n",
@@ -1562,7 +1507,7 @@
         "    # (WORKAROUND  b/219835305)\n",
         "    endpoint = return_unmanaged_endpoint(resource_name=endpoint_resource_name)\n",
         "\n",
-        "    deploy_op = ModelDeployOp(\n",
+        "    _ = ModelDeployOp(\n",
         "        model=model.outputs[\"model\"],\n",
         "        endpoint=endpoint.outputs[\"endpoint\"],\n",
         "        dedicated_resources_min_replica_count=1,\n",
@@ -1591,7 +1536,6 @@
         "\n",
         "- `display_name`: The display name for the generated Vertex AI resources.\n",
         "- `model_resource_name`: The resource name of the existing `Model` resource.\n",
-        "- `model_resource_uri`: The resource uri of the existing `Model` resource.\n",
         "- `endpoint_resource_name`: The resource name of the existing `Endpoint` resource.\n",
         "- `endpoint_resource_uri`: The resource uri of the existing `Endpoint` resource.\n",
         "- `project`: The project ID.\n",
@@ -1614,14 +1558,9 @@
         "        parameter_values={\n",
         "            \"display_name\": \"deploy_model_existing_endpoint_\" + TIMESTAMP,\n",
         "            \"model_resource_name\": model.resource_name,\n",
-        "            \"model_resource_uri\": \"https://us-central1-aiplatform.googleapis.com/v1/\"\n",
-        "            + model.resource_name,\n",
         "            \"endpoint_resource_name\": endpoint.resource_name,\n",
         "            \"endpoint_resource_uri\": \"https://us-central1-aiplatform.googleapis.com/v1/\"\n",
         "            + endpoint.resource_name,\n",
-        "            # Model properties (WORKAROUND  b/219835305)\n",
-        "            \"serving_image\": SERVING_CONTAINER_URI,\n",
-        "            \"artifact_uri\": ARTIFACT_URI,\n",
         "            \"project\": PROJECT_ID,\n",
         "            \"region\": REGION,\n",
         "        },\n",

notebooks/community/ml_ops/stage5/get_started_with_vertex_private_endpoints.ipynb

@@ -385,12 +385,11 @@
         "import sys\n",
         "\n",
         "# If on Vertex AI Workbench, then don't execute this code\n",
-        "IS_COLAB = False\n",
+        "IS_COLAB = \"google.colab\" in sys.modules\n",
         "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
         "    \"DL_ANACONDA_HOME\"\n",
         "):\n",
         "    if \"google.colab\" in sys.modules:\n",
-        "        IS_COLAB = True\n",
         "        from google.colab import auth as google_auth\n",
         "\n",
         "        google_auth.authenticate_user()\n",
@@ -1068,7 +1067,6 @@
         "- `model`: The `Model` resource.\n",
         "- `deployed_model_displayed_name`: The human readable name for the deployed model instance.\n",
         "- `machine_type`: The machine type for each VM instance.\n",
-        "- `traffic_split`: Set to `{}` to indicate no traffic split.\n",
         "\n",
         "Do to the requirements to provision the resource, this may take upto a few minutes."
       ]
@@ -1085,7 +1083,6 @@
         "    model=model,\n",
         "    deployed_model_display_name=\"example_\" + TIMESTAMP,\n",
         "    machine_type=DEPLOY_COMPUTE,\n",
-        "    traffic_split={},  # no traffic split\n",
         ")\n",
         "\n",
         "print(endpoint)"
@@ -1187,62 +1184,6 @@
         "    f.write(json.dumps({\"instances\": [{serving_input: {\"b64\": b64str}}]}))"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "23e995c35fd6"
-      },
-      "source": [
-        "#### Construct the `Private Endpoint` URI\n",
-        "\n",
-        "Next, you construct the URI for the `Private Endpoint`."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "97b248b2efb5"
-      },
-      "outputs": [],
-      "source": [
-        "endpoint_id = endpoint.resource_name\n",
-        "\n",
-        "ENDPOINT_URL = ! gcloud beta ai endpoints describe {endpoint_id} \\\n",
-        "  --region={REGION} \\\n",
-        "  --format=\"value(deployedModels.privateEndpoints.predictHttpUri)\"\n",
-        "\n",
-        "private_url = ENDPOINT_URL[1]\n",
-        "print(private_url)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "27605b5f0c3a"
-      },
-      "source": [
-        "### Make the prediction request using curl\n",
-        "\n",
-        "Use `curl` to make the prediction request to the private URI."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "6cb568e6bb49"
-      },
-      "outputs": [],
-      "source": [
-        "output = ! curl -X POST -d@instances.json $private_url\n",
-        "\n",
-        "predictions = output[5]\n",
-        "print(predictions)\n",
-        "\n",
-        "! rm test.jpg instances.json"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -1251,7 +1192,7 @@
       "source": [
         "### Make the prediction request using SDK\n",
         "\n",
-        "Finally, use the `Vertex AI SDK` to make a prediction request."
+        "Next, use the `Vertex AI SDK` to make a prediction request."
       ]
     },
     {

notebooks/community/ml_ops/stage6/README.md

@@ -30,48 +30,232 @@ This stage may be done entirely by MLOps. We recommend:
 ### Get Started
 
 
-[Get started with TensorFlow serving functions with Vertex AI Prediction](get_started_with_tf_serving_function.ipynb)
+[Get started with Vertex AI Batch Prediction for AutoML image models](community/ml_ops/stage6/get_started_with_automl_image_model_batch.ipynb)
+
+In this tutorial, you create an AutoML image classification model from a Python script, and then do a batch prediction using the Vertex AI SDK. 
 
-```
 The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` image classification model.
+- Make a batch prediction with JSONL input.
+
+[Get started with Vertex AI Matching Engine and Swivel builtin algorithm](community/ml_ops/stage6/get_started_with_matching_engine_swivel.ipynb)
+
+In this notebook, you learn how to train custom embeddings using Vertex AI Pipelines and subsequently train and deploy a matching engine index using the embeddings.
+
+The steps performed include:
+
+1. Train the `Swivel` algorithm to generate embeddings (encoder) for the dataset.
+2. Make example predictions (embeddings) from then trained encoder.
+3. Generate embeddings using the trained `Swivel` builtin algorithm.
+4. Store embeddings to format supported by `Matching Engine`.
+5. Create a `Matching Engine Index` for the embeddings.
+6. Deploy the `Matching Engine Index` to a `Index Endpoint`.
+7. Make a matching engine prediction request.
+
+[Get started with Vertex AI Matching Engine](community/ml_ops/stage6/get_started_with_matching_engine.ipynb)
+
+In this notebook, you learn how to create Approximate Nearest Neighbor (ANN) Index, query against indexes. 
+
+The steps performed include:
+
+- Create ANN Index.
+- Create an IndexEndpoint with VPC Network
+- Deploy ANN Index
+- Perform online query
+- Deploy brute force Index.
+- Perform calibration between ANN and brute force index.
+
+[Get started with Vertex AI Matching Engine and Two Towers builtin algorithm](community/ml_ops/stage6/get_started_with_matching_engine_twotowers.ipynb)
+
+
+In this notebook, you learn how to use the `Two-Tower` builtin algorithms for generating embeddings for a dataset, for use with generating an `Matching Engine Index`, with the `Vertex AI Matching Engine` service.
+
+The steps performed include:
+
+1. Train the `Two-Tower` algorithm to generate embeddings (encoder) for the dataset.
+2. Hyperparameter tune the trained `Two-Tower` encoder.
+3. Make example predictions (embeddings) from then trained encoder.
+4. Generate embeddings using the trained `Two-Tower` builtin algorithm.
+5. Store embeddings to format supported by `Matching Engine`.
+6. Create a `Matching Engine Index` for the embeddings.
+7. Deploy the `Matching Engine Index` to a `Index Endpoint`.
+8. Make a matching engine prediction request.
+
+[Get started with Vertex AI Batch Prediction for custom tabular models](community/ml_ops/stage6/get_started_with_custom_tabular_model_batch.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Batch Prediction`  with a custom tabular model.
+
+The steps performed include:
+
+- Upload a pretrained tabular model as a `Vertex AI Model` resource.
+- Make batch prediction to the `Model` resource, in JSONL format.
+- Make batch prediction to the `Model` resource, in CSV format.
+- Make batch prediction to the `Model` resource, in BigQuery format.
+
+[Get started with Optimized TensorFlow Enterprise container with Vertex AI Prediction / text models](community/ml_ops/stage6/get_started_with_optimized_tfe_bert.ipynb)
+
+In this tutorial, you learn how to use `TensorFlow Enterprise Optimized` container for TensorFlow models deployed to a `Vertex AI Endpoint` resource.
+
+The steps performed include:
+
+- Download a pretrained BERT model from TensorFlow Hub.
+- Fine-tune (transfer learning) the BERT model as a binary classifier.
+- Upload the TensorFlow Hub model as a `Vertex AI Model` resource, with standard TensorFlow serving container.
+- Upload the TensorFlow Hub model as a `Vertex AI Model` resource, with TensorFlow Enterprise Optimized container
+- Create two `Endpoint` resources.
+- Deploying both `Model` resources to separate `Endpoint` resources.
+- Make the same online prediction requests to both `Model` resource instances deployed to the `Endpoint` resources.
+- Compare the prediction accuracy between the two deployed `Model` resources.
+- Configuring container settings for fine-tune control of optimizations.
+- Create a `Private Endpoint` resource.
+- Deploy the `Model` resoure with then `TensorFlow Enterprise Optimized` to the `Private Endpoint` resource.
+- Make an online prediction request to the `Private Endpoint` resource.
+
+[Get started with Vertex AI Batch Prediction and Explainable AI for AutoML tabular models](community/ml_ops/stage6/get_started_with_automl_tabular_model_batch.ipynb)
+
+In this tutorial, you create an AutoML tabular binary classification model from a Python script, and then do a batch prediction with Explainable AI using the Vertex AI SDK. You can alternatively create and deploy models using the `gcloud` command-line tool or online using the Cloud Console.
+
+The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` tabular model.
+- Make a batch prediction with CSV input.
+- Make a batch prediction with JSONL objects input.
+- Make a batch prediction with JSONL list input.
+- Make a batch prediction with BigQuery table input.
+- Make a batch prediction with explanations.
+
+[Get started with re-importing AutoML tabular models](community/ml_ops/stage6/get_started_with_automl_tabular_exported_deploy.ipynb)
+
+In this tutorial, you learn how to use `AutoML Tabular` for re-importing exported model artifacts as a `Model` resource. This is useful for example, if one wants to move the exported model across projects.
+
+The steps performed include:
+
+- Importing a pretrained AutoML tabular exported model artifacts, as a `Model` resource.
+- Create an `Endpoint` resource.
+- Deploy the `Model` resource to the `Endpoint` resource.
+- Make a prediction.
+
+[Get started with Vertex AI Batch Prediction for AutoML text models](community/ml_ops/stage6/get_started_with_automl_text_model_batch.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Batch Prediction`  with a `AutoML` text model.
+
+The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` model.
+- Make a batch prediction with JSONL input
+
+[Get started with Vertex AI Prediction for AutoML text models](community/ml_ops/stage6/get_started_with_automl_text_model_online.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Prediction`  with a `AutoML` text model.
+
+The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` model.
+- Deploy the model to an `Endpoint` resource.
+- Make an online prediction.
+
+[Get started with TensorFlow serving functions with Vertex AI Raw Prediction](community/ml_ops/stage6/get_started_with_raw_predict.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Raw Prediction` on a `Vertex AI Endpoint` resource.
+
+The steps performed include:
+
+- Download a pretrained tabular classification model artifacts for a TensorFlow 1.x estimator.
+- Upload the TensorFlow estimator model as a `Vertex AI Model` resource.
+- Creating an `Endpoint` resource.
+- Deploying the `Model` resource to an `Endpoint` resource.
+- Make an online raw prediction to the `Model` resource instance deployed to the `Endpoint` resource.
+
+[Get started with TensorFlow serving functions with Vertex AI Prediction](community/ml_ops/stage6/get_started_with_tf_serving_function.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Prediction` on a `Vertex AI Endpoint` resource with a serving function.
+
+The steps performed include:
+
 - Download a pretrained image classification model from TensorFlow Hub.
 - Create a serving function to receive compressed image data, and output decomopressed preprocessed data for the model input.
 - Upload the TensorFlow Hub model and serving function as a `Vertex AI Model` resource.
 - Creating an `Endpoint` resource.
 - Deploying the `Model` resource to an `Endpoint` resource.
 - Make an online prediction to the `Model` resource instance deployed to the `Endpoint` resource.
-```
 
-[Get started with FastAPI with Vertex AI Prediction](get_started_with_fastapi.ipynb)
+[Get started with Vertex Explainable AI using custom deployment container](community/ml_ops/stage6/get_started_with_xai_and_custom_server.ipynb)
+
+In this tutorial, you learn to build a custom container to serve a PyTorch model on `Vertex AI Endpoint`. 
 
-```
 The steps performed include:
+
+- Locally train a Pytorch tabular classifier.
+- Locally test the trained model.
+- Build a HTTP server using FastAPI.
+- Create a custom serving container with the trained model and FastAPI server.
+- Locally test the custom serving container.
+- Push the custom serving container to the Artifact Registry.
+- Upload the custom serving container as a `Model` resource.
+- Deploy the `Model` resource to an `Endpoint` resource.
+- Make a prediction request to the deployed custom serving container.
+- Make an explanation request to the deployed custom serving container.
+
+[Get started with Vertex AI Online Prediction for AutoML image models](community/ml_ops/stage6/get_started_with_automl_image_model_online.ipynb)
+
+In this tutorial, you create an AutoML image classification model from a Python script, and then do an online prediction using the Vertex AI SDK. 
+
+The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` image classification model.
+- Make an online prediction.
+
+[Get started with FastAPI with Vertex AI Prediction](community/ml_ops/stage6/get_started_with_fastapi.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Prediction` on a `Vertex AI Endpoint` with a custom serving binary using `FastAPI`.
+
+The steps performed include:
+
 - Download a pretrained image classification model from TensorFlow Hub.
 - Create a serving function to receive compressed image data, and output decomopressed preprocessed data for the model input.
 - Upload the TensorFlow Hub model and serving function as a `Vertex AI Model` resource.
 - Creating an `Endpoint` resource.
 - Deploying the `Model` resource to an `Endpoint` resource with `FastAPI` custom serving binary.
 - Make an online prediction to the `Model` resource instance deployed to the `Endpoint` resource.
-```
 
-[Get started with Nvidia Triton server](get_started_with_nvidia_triton_serving.ipynb)
+[Get started with Vertex AI Online Prediction for AutoML tabular models](community/ml_ops/stage6/get_started_with_automl_tabular_model_online.ipynb)
 
-```
-The steps performed in this tutorial include:
-- Download the model artifacts from TensorFlow Hub.
-- Create Triton serving configuration file for the model.
-- Construct a custom container, with Triton serving image, for model deployment.
-- Upload the model as a `Vertex AI Model` resource.
-- Deploy the `Vertex AI Model` resource to a `Vertex AI Endpoint` resource.
-- Make a prediction request
-- Undeploy the `Model` resource and delete the `Endpoint`
+In this tutorial, you create an AutoML tabular binary classification model from a Python script, and then do an online prediction using the Vertex AI SDK. 
 
-```
-
-[Get started with Custom Prediction Routine (CPR)](get_started_with_cpr.ipynb)
-
-```
 The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` tabular model.
+- Deploy the model to an `Endpoint` resource.
+- Make an online prediction.
+- Make an online prediction with explanations.
+
+[Get started with TensorFlow Serving with Vertex AI Prediction](community/ml_ops/stage6/get_started_with_tf_serving.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Prediction` on a `Vertex AI Endpoint` resource with `TensorFlow Serving` serving binary.
+
+The steps performed include:
+
+- Download a pretrained image classification model from TensorFlow Hub.
+- Create a serving function to receive compressed image data, and output decomopressed preprocessed data for the model input.
+- Upload the TensorFlow Hub model and serving function as a `Vertex AI Model` resource.
+- Creating an `Endpoint` resource.
+- Deploying the `Model` resource to an `Endpoint` resource with `TensorFlow Serving` serving binary.
+- Make an online prediction to the `Model` resource instance deployed to the `Endpoint` resource.
+- Make a batch prediction to the `Model` resource instance.
+
+[Get started with Custom Prediction Routine (CPR)](community/ml_ops/stage6/get_started_with_cpr.ipynb)
+
+In this tutorial, you learn how to use Custom Prediction Routine (CPR) for `Vertex AI Predictions`.
+
+The steps performed include:
+
 - Write a custom data preprocessor.
 - Train the model.
 - Build a custom scikit-learn serving container with custom data preprocessing using the Custom Prediction Routine model server.
@@ -93,115 +277,50 @@ The steps performed include:
     - Test the model serving container locally.
     - Upload and deploy the model serving container to Vertex AI Endpoint.
     - Make a prediction request.
-```
 
-[Get started with re-importing AutoML tabular models](get_started_automl_tabular_exported_deploy.ipynb)
+[Get started with Vertex AI Batch Prediction for custom text models](community/ml_ops/stage6/get_started_with_custom_text_model_batch.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Batch Prediction`  with a custom text model.
 
-```
 The steps performed include:
-- Importing a pretrained AutoML tabular exported model artifacts, as a `Model` resource.
-- Create an `Endpoint` resource.
-- Deploy the `Model` resource to the `Endpoint` resource.
-- Make a prediction.
-```
 
-[Get started with Vertex Explainable AI using custom deployment container](get_started_with_xai_and_custom_server.ipynb)
+- Download a pretrained TensorFlow RNN model.
+- Upload the pretrained model as a `Vertex AI Model` resource.
+- Make batch prediction to the `Model` resource, in JSONL format.
+
+[Get started with NVIDIA Triton server](community/ml_ops/stage6/get_started_with_nvidia_triton_serving.ipynb)
+
+In this tutorial, you deploy a container running Nvidia Triton Server with a `Vertex AI Model` resource to a `Vertex AI Endpoint` for making online predictions.
+
+The steps performed in this tutorial include:
+
+- Download the model artifacts from TensorFlow Hub.
+- Create Triton serving configuration file for the model.
+- Construct a custom container, with Triton serving image, for model deployment.
+- Upload the model as a `Vertex AI Model` resource.
+- Deploy the `Vertex AI Model` resource to a `Vertex AI Endpoint` resource.
+- Make a prediction request
+- Undeploy the `Model` resource and delete the `Endpoint`
+
+[Get started with Vertex AI Batch Prediction for custom image models](community/ml_ops/stage6/get_started_with_custom_image_model_batch.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Batch Prediction`  with a custom image model.
 
-```
 The steps performed include:
-- Locally train a Pytorch tabular classifier.
-- Locally test the trained model.
-- Build a HTTP server using FastAPI.
-- Create a custom serving container with the trained model and FastAPI server.
-- Locally test the custom serving container.
-- Push the custom serving container to the Artifact Registry.
-- Upload the custom serving container as a `Model` resource.
-- Deploy the `Model` resource to an `Endpoint` resource.
-- Make a prediction request to the deployed custom serving container.
-- Make an explanation request to the deployed custom serving container.
 
-```
-
-[Get started with TensorFlow serving functions with Vertex AI Raw Prediction](get_started_with_raw_predict.ipynb)
-
-```
-The steps performed include:
-- Download a pretrained tabular classification model artifacts for a TensorFlow 1.x estimator.
-- Upload the TensorFlow estimator model as a `Vertex AI Model` resource.
-- Creating an `Endpoint` resource.
-- Deploying the `Model` resource to an `Endpoint` resource.
-- Make an online raw prediction to the `Model` resource instance deployed to the `Endpoint` resource.
-```
-
-[Get started with Vertex AI Matching Engine and Two Towers builtin algorithm](get_started_with_matching_engine_twotowers.ipynb)
-
-```
-The steps performed include:
-1. Train the `Two-Tower` algorithm to generate embeddings (encoder) for the dataset.
-2. Hyperparameter tune the trained `Two-Tower` encoder.
-3. Make example predictions (embeddings) from then trained encoder.
-4. Generate embeddings using the trained `Two-Tower` builtin algorithm.
-5. Store embeddings to format supported by `Matching Engine`.
-6. Create a `Matching Engine Index` for the embeddings.
-7. Deploy the `Matching Engine Index` to a `Index Endpoint`.
-8. Make a matching engine prediction request.
-
-```
-
-[Get started with Optimized TensorFlow Enterprise container with Vertex AI Prediction / text models](get_started_with_optimized_tfe_bert.ipynb)
-
-```
-The steps performed include:
-- Download a pretrained BERT model from TensorFlow Hub.
-- Fine-tune (transfer learning) the BERT model as a binary classifier.
-- Upload the TensorFlow Hub model as a `Vertex AI Model` resource, with standard TensorFlow serving container.
-- Upload the TensorFlow Hub model as a `Vertex AI Model` resource, with TensorFlow Enterprise Optimized container
-- Create two `Endpoint` resources.
-- Deploying both `Model` resources to separate `Endpoint` resources.
-- Make the same online prediction requests to both `Model` resource instances deployed to the `Endpoint` resources.
-- Compare the prediction accuracy between the two deployed `Model` resources.
-- Configuring container settings for fine-tune control of optimizations.
-- Create a `Private Endpoint` resource.
-- Deploy the `Model` resoure with then `TensorFlow Enterprise Optimized` to the `Private Endpoint` resource.
-- Make an online prediction request to the `Private Endpoint` resource.
-
-```
-
-[Get started with Vertex AI Matching Engine](get_started_with_matching_engine.ipynb)
-
-```
-The steps performed include:
-- Create ANN Index.
-- Create an IndexEndpoint with VPC Network
-- Deploy ANN Index
-- Perform online query
-- Deploy brute force Index.
-- Perform calibration between ANN and brute force index.
-
-```
-
-[Get started with Vertex AI Matching Engine and Swivel builtin algorithm](get_started_with_matching_engine_swivel.ipynb)
-
-```
-The steps performed include:
-1. Train the `Swivel` algorithm to generate embeddings (encoder) for the dataset.
-2. Make example predictions (embeddings) from then trained encoder.
-3. Generate embeddings using the trained `Swivel` builtin algorithm.
-4. Store embeddings to format supported by `Matching Engine`.
-5. Create a `Matching Engine Index` for the embeddings.
-6. Deploy the `Matching Engine Index` to a `Index Endpoint`.
-7. Make a matching engine prediction request.
-
-```
-
-[Get started with TensorFlow serving with Vertex AI Prediction](get_started_with_tf_serving.ipynb)
-
-```
-The steps performed include:
 - Download a pretrained image classification model from TensorFlow Hub.
+- Upload the TensorFlow Hub model as a `Vertex AI Model` resource.
+- Make batch prediction with raw (uncompressed) image data to the `Model` resource, in JSONL format.
 - Create a serving function to receive compressed image data, and output decomopressed preprocessed data for the model input.
 - Upload the TensorFlow Hub model and serving function as a `Vertex AI Model` resource.
-- Creating an `Endpoint` resource.
-- Deploying the `Model` resource to an `Endpoint` resource with `TensorFlow Serving` serving binary.
-- Make an online prediction to the `Model` resource instance deployed to the `Endpoint` resource.
-```
+- Make batch prediction with compressed image data to the `Model` resource, in File-List format.
+
+[Get started with Vertex AI Batch Prediction for AutoML video models](community/ml_ops/stage6/get_started_with_automl_video_model_batch.ipynb)
+
+In this tutorial, you learn how to use `Vertex AI Batch Prediction`  with a `AutoML` video model.
+
+The steps performed include:
+
+- Create a Vertex `Dataset` resource.
+- Train an `AutoML` model.
+- Make a batch prediction with JSONL input.

notebooks/community/ml_ops/stage6/get_started_automl_tabular_exported_deploy.ipynb

@@ -1,879 +0,0 @@
-{
-  "cells": [
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "copyright"
-      },
-      "outputs": [],
-      "source": [
-        "# Copyright 2022 Google LLC\n",
-        "#\n",
-        "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
-        "# you may not use this file except in compliance with the License.\n",
-        "# You may obtain a copy of the License at\n",
-        "#\n",
-        "#     https://www.apache.org/licenses/LICENSE-2.0\n",
-        "#\n",
-        "# Unless required by applicable law or agreed to in writing, software\n",
-        "# distributed under the License is distributed on an \"AS IS\" BASIS,\n",
-        "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n",
-        "# See the License for the specific language governing permissions and\n",
-        "# limitations under the License."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "title:generic,gcp"
-      },
-      "source": [
-        "# E2E ML on GCP: MLOps stage 6 : serving: get started with re-importing AutoML tabular models\n",
-        "\n",
-        "<table align=\"left\">\n",
-        "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage6/get_started_automl_tabular_exported_deploy.ipynb\">\n",
-        "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
-        "      View on GitHub\n",
-        "    </a>\n",
-        "  </td>\n",
-        "  <td>\n",
-        "        <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage6/get_started_automl_tabular_exported_deploy.ipynb\">\n",
-        "        <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
-        "        </a>\n",
-        "  </td>\n",
-        "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/ml_ops/stage6/get_started_automl_tabular_exported_deploy.ipynb\">\n",
-        "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
-        "      Open in Vertex AI Workbench\n",
-        "    </a>\n",
-        "  </td>\n",
-        "</table>\n",
-        "<br/><br/><br/>"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "overview:mlops"
-      },
-      "source": [
-        "## Overview\n",
-        "\n",
-        "\n",
-        "This tutorial demonstrates how to use Vertex AI for E2E MLOps on Google Cloud in production. This tutorial covers stage 2 : experimentation: get started with AutoML Training."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "objective:mlops,stage2,get_started_automl_training"
-      },
-      "source": [
-        "### Objective\n",
-        "\n",
-        "In this tutorial, you learn how to use `AutoML Tabular` for re-importing exported model artifacts as a `Model` resource. This is useful for example, if one wants to move the exported model across projects.\n",
-        "\n",
-        "This tutorial uses the following Google Cloud ML services:\n",
-        "\n",
-        "- `AutoML Tabular`\n",
-        "- `Vertex AI Model` resource\n",
-        "- `Vertex AI Prediction`\n",
-        "\n",
-        "The steps performed include:\n",
-        "\n",
-        "- Importing a pretrained AutoML tabular exported model artifacts, as a `Model` resource.\n",
-        "- Create an `Endpoint` resource.\n",
-        "- Deploy the `Model` resource to the `Endpoint` resource.\n",
-        "- Make a prediction."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "dataset:flowers,icn"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "This tutorial uses a pretrained AutoML tabular model with exported model artifacts.\n",
-        "\n",
-        "\n",
-        "The tabular dataset used for the pretrained model is the GSOD dataset from [BigQuery public datasets](https://cloud.google.com/bigquery/public-data). The version of the dataset you use only the fields year, month and day to predict the value of mean daily temperature (mean_temp).\n",
-        "\n",
-        "*Note:* This version of the exported model contains the custom op and requires the model server: us-docker.pkg.dev/vertex-ai/automl-tabular/prediction-server"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "fb3451ce8e47"
-      },
-      "source": [
-        "### Costs\n",
-        "This tutorial uses billable components of Google Cloud:\n",
-        "\n",
-        "- Vertex AI\n",
-        "- Cloud Storage\n",
-        "\n",
-        "Learn about [Vertex AI pricing](https://cloud.google.com/vertex-ai/pricing) and [Cloud Storage pricing](https://cloud.google.com/storage/pricing) and use the [Pricing Calculator](https://cloud.google.com/products/calculator/) to generate a cost estimate based on your projected usage."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "install_mlops"
-      },
-      "source": [
-        "## Installations\n",
-        "\n",
-        "Install the packages required for executing this notebook."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "install_mlops"
-      },
-      "outputs": [],
-      "source": [
-        "import os\n",
-        "\n",
-        "# The Vertex AI Workbench Notebook product has specific requirements\n",
-        "IS_WORKBENCH_NOTEBOOK = os.getenv(\"DL_ANACONDA_HOME\") and not os.getenv(\"VIRTUAL_ENV\")\n",
-        "IS_USER_MANAGED_WORKBENCH_NOTEBOOK = os.path.exists(\n",
-        "    \"/opt/deeplearning/metadata/env_version\"\n",
-        ")\n",
-        "\n",
-        "# Vertex AI Notebook requires dependencies to be installed with '--user'\n",
-        "USER_FLAG = \"\"\n",
-        "if IS_WORKBENCH_NOTEBOOK:\n",
-        "    USER_FLAG = \"--user\"\n",
-        "\n",
-        "# Install the packages\n",
-        "\n",
-        "! pip3 install --upgrade google-cloud-aiplatform {USER_FLAG} -q\n",
-        "! pip3 install --upgrade google-cloud-storage {USER_FLAG} -q"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "restart"
-      },
-      "source": [
-        "### Restart the kernel\n",
-        "\n",
-        "Once you've installed the additional packages, you need to restart the notebook kernel so it can find the packages."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "restart"
-      },
-      "outputs": [],
-      "source": [
-        "import os\n",
-        "\n",
-        "if not os.getenv(\"IS_TESTING\"):\n",
-        "    # Automatically restart kernel after installs\n",
-        "    import IPython\n",
-        "\n",
-        "    app = IPython.Application.instance()\n",
-        "    app.kernel.do_shutdown(True)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "project_id"
-      },
-      "source": [
-        "## Before you begin\n",
-        "\n",
-        "### Set up your Google Cloud project\n",
-        "\n",
-        "**The following steps are required, regardless of your notebook environment.**\n",
-        "\n",
-        "1. [Select or create a Google Cloud project](https://console.cloud.google.com/cloud-resource-manager). When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
-        "\n",
-        "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
-        "\n",
-        "1. [Enable the Vertex AI, Compute Engine and Cloud Storage APIs](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component,storage_component).\n",
-        "\n",
-        "1. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
-        "\n",
-        "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
-        "Cloud SDK uses the right project for all the commands in this notebook.\n",
-        "\n",
-        "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$` into these commands."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "56d591439df1"
-      },
-      "source": [
-        "#### Set your project ID\n",
-        "\n",
-        "**If you don't know your project ID**, you may be able to get your project ID using `gcloud`."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "set_project_id"
-      },
-      "outputs": [],
-      "source": [
-        "PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "autoset_project_id"
-      },
-      "outputs": [],
-      "source": [
-        "if PROJECT_ID == \"\" or PROJECT_ID is None or PROJECT_ID == \"[your-project-id]\":\n",
-        "    # Get your GCP project id from gcloud\n",
-        "    shell_output = ! gcloud config list --format 'value(core.project)' 2>/dev/null\n",
-        "    PROJECT_ID = shell_output[0]\n",
-        "    print(\"Project ID:\", PROJECT_ID)"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "set_gcloud_project_id"
-      },
-      "outputs": [],
-      "source": [
-        "! gcloud config set project $PROJECT_ID"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "region"
-      },
-      "source": [
-        "#### Region\n",
-        "\n",
-        "You can also change the `REGION` variable, which is used for operations\n",
-        "throughout the rest of this notebook.  Below are regions supported for Vertex AI. We recommend that you choose the region closest to you.\n",
-        "\n",
-        "- Americas: `us-central1`\n",
-        "- Europe: `europe-west4`\n",
-        "- Asia Pacific: `asia-east1`\n",
-        "\n",
-        "You may not use a multi-regional bucket for training with Vertex AI. Not all regions provide support for all Vertex AI services.\n",
-        "\n",
-        "Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations)."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "region"
-      },
-      "outputs": [],
-      "source": [
-        "REGION = \"[your-region]\"  # @param {type: \"string\"}\n",
-        "\n",
-        "if REGION == \"[your-region]\":\n",
-        "    REGION = \"us-central1\""
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "timestamp"
-      },
-      "source": [
-        "#### Timestamp\n",
-        "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "timestamp"
-      },
-      "outputs": [],
-      "source": [
-        "from datetime import datetime\n",
-        "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "3ffa6b6c7cdb"
-      },
-      "source": [
-        "### Authenticate your Google Cloud account\n",
-        "\n",
-        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. Skip this step.\n",
-        "\n",
-        "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
-        "\n",
-        "**Otherwise**, follow these steps:\n",
-        "\n",
-        "In the Cloud Console, go to the [Create service account key](https://console.cloud.google.com/apis/credentials/serviceaccountkey) page.\n",
-        "\n",
-        "1. **Click Create service account**.\n",
-        "\n",
-        "2. In the **Service account name** field, enter a name, and click **Create**.\n",
-        "\n",
-        "3. In the **Grant this service account access to project** section, click the Role drop-down list. Type \"Vertex AI\" into the filter box, and select **Vertex AI Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
-        "\n",
-        "4. Click Create. A JSON file that contains your key downloads to your local environment.\n",
-        "\n",
-        "5. Enter the path to your service account key as the GOOGLE_APPLICATION_CREDENTIALS variable in the cell below and run the cell."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "2b72272258fc"
-      },
-      "outputs": [],
-      "source": [
-        "# If you are running this notebook in Colab, run this cell and follow the\n",
-        "# instructions to authenticate your GCP account. This provides access to your\n",
-        "# Cloud Storage bucket and lets you submit training jobs and prediction\n",
-        "# requests.\n",
-        "\n",
-        "import os\n",
-        "import sys\n",
-        "\n",
-        "# If on Vertex AI Workbench, then don't execute this code\n",
-        "IS_COLAB = \"google.colab\" in sys.modules\n",
-        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
-        "    \"DL_ANACONDA_HOME\"\n",
-        "):\n",
-        "    if \"google.colab\" in sys.modules:\n",
-        "        from google.colab import auth as google_auth\n",
-        "\n",
-        "        google_auth.authenticate_user()\n",
-        "\n",
-        "    # If you are running this notebook locally, replace the string below with the\n",
-        "    # path to your service account key and run this cell to authenticate your GCP\n",
-        "    # account.\n",
-        "    elif not os.getenv(\"IS_TESTING\"):\n",
-        "        %env GOOGLE_APPLICATION_CREDENTIALS ''"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "bucket:mbsdk"
-      },
-      "source": [
-        "### Create a Cloud Storage bucket\n",
-        "\n",
-        "**The following steps are required, regardless of your notebook environment.**\n",
-        "\n",
-        "When you initialize the Vertex SDK for Python, you specify a Cloud Storage staging bucket. The staging bucket is where all the data associated with your dataset and model resources are retained across sessions.\n",
-        "\n",
-        "Set the name of your Cloud Storage bucket below. Bucket names must be globally unique across all Google Cloud projects, including those outside of your organization."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "bucket"
-      },
-      "outputs": [],
-      "source": [
-        "BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}\n",
-        "BUCKET_URI = f\"gs://{BUCKET_NAME}\""
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "autoset_bucket"
-      },
-      "outputs": [],
-      "source": [
-        "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
-        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + TIMESTAMP\n",
-        "    BUCKET_URI = \"gs://\" + BUCKET_NAME"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "create_bucket"
-      },
-      "source": [
-        "**Only if your bucket doesn't already exist**: Run the following cell to create your Cloud Storage bucket."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "create_bucket"
-      },
-      "outputs": [],
-      "source": [
-        "! gsutil mb -l $REGION $BUCKET_URI"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "validate_bucket"
-      },
-      "source": [
-        "Finally, validate access to your Cloud Storage bucket by examining its contents:"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "validate_bucket"
-      },
-      "outputs": [],
-      "source": [
-        "! gsutil ls -al $BUCKET_URI"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "setup_vars"
-      },
-      "source": [
-        "### Set up variables\n",
-        "\n",
-        "Next, set up some variables used throughout the tutorial.\n",
-        "### Import libraries and define constants"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "import_aip:mbsdk"
-      },
-      "outputs": [],
-      "source": [
-        "import google.cloud.aiplatform as aiplatform"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "init_aip:mbsdk"
-      },
-      "source": [
-        "### Initialize Vertex AI SDK for Python\n",
-        "\n",
-        "Initialize the Vertex AI SDK for Python for your project and corresponding bucket."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "init_aip:mbsdk"
-      },
-      "outputs": [],
-      "source": [
-        "aiplatform.init(project=PROJECT_ID, staging_bucket=BUCKET_URI)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "machine:training"
-      },
-      "source": [
-        "#### Set machine type\n",
-        "\n",
-        "Next, set the machine type to use for training.\n",
-        "\n",
-        "- Set the variable `DEPLOY_COMPUTE` to configure  the compute resources for the VMs you will use for for training.\n",
-        " - `machine type`\n",
-        "     - `n1-standard`: 3.75GB of memory per vCPU.\n",
-        "     - `n1-highmem`: 6.5GB of memory per vCPU\n",
-        "     - `n1-highcpu`: 0.9 GB of memory per vCPU\n",
-        " - `vCPUs`: number of \\[2, 4, 8, 16, 32, 64, 96 \\]\n",
-        "\n",
-        "*Note: The following is not supported for training:*\n",
-        "\n",
-        " - `standard`: 2 vCPUs\n",
-        " - `highcpu`: 2, 4 and 8 vCPUs\n",
-        "\n",
-        "*Note: You may also use n2 and e2 machine types for training and deployment, but they do not support GPUs*."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "machine:training"
-      },
-      "outputs": [],
-      "source": [
-        "if os.getenv(\"IS_TESTING_DEPLOY_MACHINE\"):\n",
-        "    MACHINE_TYPE = os.getenv(\"IS_TESTING_DEPLOY_MACHINE\")\n",
-        "else:\n",
-        "    MACHINE_TYPE = \"n1-standard\"\n",
-        "\n",
-        "VCPU = \"4\"\n",
-        "DEPLOY_COMPUTE = MACHINE_TYPE + \"-\" + VCPU\n",
-        "print(\"Train machine type\", DEPLOY_COMPUTE)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "import_file:u_dataset,csv"
-      },
-      "source": [
-        "### Location of pretrained `AutoML Tabular` exported model\n",
-        "\n",
-        "Now set the variable `MODEL_PACKAGE` to the location of the exported model artifacts in Cloud Storage."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "import_file:flowers,csv,icn"
-      },
-      "outputs": [],
-      "source": [
-        "MODEL_PACKAGE = \"gs://cloud-samples-data/vertex-ai/tabular-workflows/models/custom_op\""
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "quick_peek:csv"
-      },
-      "source": [
-        "#### Quick peek at your model package.\n",
-        "\n",
-        "Next, take a look at the contents of the model package for the exported AutoML tabular model."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "quick_peek:csv"
-      },
-      "outputs": [],
-      "source": [
-        "! gsutil ls {MODEL_PACKAGE}"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "automl_tabular_intro"
-      },
-      "source": [
-        "## AutoML tabular models\n",
-        "\n",
-        "AutoML can train the following types of tabular models:\n",
-        "\n",
-        "- classification\n",
-        "- regression\n",
-        "- forecasting\n",
-        "\n",
-        "A model can be trained for either automatic deployment to the cloud or exported for manual deployment to the cloud. In this tutorial, you use a pretrained exported AutoML tabular model.\n",
-        "\n",
-        "Learn more about [AutoML Model Types](https://cloud.google.com/vertex-ai/docs/start/automl-model-types)\n",
-        "\n",
-        "Learn more about [Exporting AutoML Tabular models](https://cloud.google.com/vertex-ai/docs/export/export-model-tabular)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "c10efb34321b"
-      },
-      "source": [
-        "### Set the model server\n",
-        "\n",
-        "Next, you set the pre-built container for the model server. The container will be a version of `us-docker.pkg.dev/vertex-ai/automl-tabular/prediction-server`. If the model package contains an `environment.json` file, use the container version specified by the key `container_uri`; otherwise, use `us-docker.pkg.dev/vertex-ai/automl-tabular/prediction-server:latest` "
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "a5f271de9040"
-      },
-      "outputs": [],
-      "source": [
-        "import json\n",
-        "\n",
-        "output = !gsutil cat {MODEL_PACKAGE}/environment.json\n",
-        "\n",
-        "MODEL_SERVER = json.loads(output[0])[\"container_uri\"]"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "e8ce91147c93"
-      },
-      "source": [
-        "### Upload the pretrained exported `AutoML Tabular` model package to a `Vertex AI Model` resource\n",
-        "\n",
-        "Next, you upload the model artifacts for the pretrained exported `AutoML Tabular` model into a `Vertex AI Model` resource, using the `Model.upload()` method with the following parameters:\n",
-        "\n",
-        "- `display_name`: A human readable name for the `Model` resource.\n",
-        "- `artifact_uri`: The Cloud Storage location of the model package.\n",
-        "- `serving_container_image_uri`: The serving container image.\n",
-        "- `serving_container_ports`: The serving port.\n",
-        "\n",
-        "*Note:* When you upload the model artifacts to a `Vertex Model` resource, you specify the corresponding deployment container image."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "7988eae27f80"
-      },
-      "outputs": [],
-      "source": [
-        "model = aiplatform.Model.upload(\n",
-        "    display_name=\"gsod_\" + TIMESTAMP,\n",
-        "    artifact_uri=MODEL_PACKAGE,\n",
-        "    serving_container_image_uri=MODEL_SERVER,\n",
-        "    serving_container_ports=[8080],\n",
-        ")"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "628de0914ba1"
-      },
-      "source": [
-        "## Creating an `Endpoint` resource\n",
-        "\n",
-        "You create an `Endpoint` resource using the `Endpoint.create()` method. At a minimum, you specify the display name for the endpoint. Optionally, you can specify the project and location (region); otherwise the settings are inherited by the values you set when you initialized the Vertex AI SDK with the `init()` method.\n",
-        "\n",
-        "In this example, the following parameters are specified:\n",
-        "\n",
-        "- `display_name`: A human readable name for the `Endpoint` resource.\n",
-        "- `project`: Your project ID.\n",
-        "- `location`: Your region.\n",
-        "- `labels`: (optional) User defined metadata for the `Endpoint` in the form of key/value pairs.\n",
-        "\n",
-        "This method returns an `Endpoint` object.\n",
-        "\n",
-        "Learn more about [Vertex AI Endpoints](https://cloud.google.com/vertex-ai/docs/predictions/deploy-model-api)."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "0ea443f9593b"
-      },
-      "outputs": [],
-      "source": [
-        "endpoint = aiplatform.Endpoint.create(\n",
-        "    display_name=\"gsod_\" + TIMESTAMP,\n",
-        "    project=PROJECT_ID,\n",
-        "    location=REGION,\n",
-        "    labels={\"your_key\": \"your_value\"},\n",
-        ")\n",
-        "\n",
-        "print(endpoint)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "ca3fa3f6a894"
-      },
-      "source": [
-        "## Deploying `Model` resources to an `Endpoint` resource.\n",
-        "\n",
-        "You can deploy one of more `Vertex AI Model` resource instances to the same endpoint. Each `Vertex AI Model` resource that is deployed will have its own deployment container for the serving binary. \n",
-        "\n",
-        "*Note:* For this example, you specified the deployment container for the exported AutoML Tabular model in the previous step of uploading the model artifacts to a `Vertex AI Model` resource.\n",
-        "\n",
-        "To deploy, you specify the following additional configuration settings:\n",
-        "\n",
-        "- The machine type.\n",
-        "- The (if any) type and number of GPUs.\n",
-        "- Static, manual or auto-scaling of VM instances.\n",
-        "\n",
-        "In this example, you deploy the model with the minimal amount of specified parameters, as follows:\n",
-        "\n",
-        "- `model`: The `Model` resource.\n",
-        "- `deployed_model_displayed_name`: The human readable name for the deployed model instance.\n",
-        "- `machine_type`: The machine type for each VM instance.\n",
-        "\n",
-        "Do to the requirements to provision the resource, this may take upto a few minutes."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "4e93b034a72f"
-      },
-      "outputs": [],
-      "source": [
-        "response = endpoint.deploy(\n",
-        "    model=model,\n",
-        "    deployed_model_display_name=\"gsod_\" + TIMESTAMP,\n",
-        "    machine_type=DEPLOY_COMPUTE,\n",
-        ")\n",
-        "\n",
-        "print(response)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "f75331c946d5"
-      },
-      "source": [
-        "## Make a prediction\n",
-        "\n",
-        "Finally, you make an online prediction using the `endpoint()` method, with the following parameters:\n",
-        "\n",
-        "- `instances`: The instances to predict.\n",
-        "\n",
-        "The following is the for a prediction request:\n",
-        "\n",
-        "    [ INSTANCE_1, INSTANCE_2, ... ]\n",
-        "    \n",
-        "    INSTANCE : { \"column_1\": value, \"column_2\": value, ... }\n"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "72683bd9d777"
-      },
-      "outputs": [],
-      "source": [
-        "INSTANCES = [{\"year\": \"2020\", \"month\": \"1\", \"day\": \"23\"}]\n",
-        "\n",
-        "prediction = endpoint.predict(instances=INSTANCES)\n",
-        "print(prediction)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "endpoint_delete:mbsdk"
-      },
-      "source": [
-        "#### Delete the endpoint\n",
-        "\n",
-        "The method 'delete()' will delete the endpoint."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "endpoint_delete:mbsdk"
-      },
-      "outputs": [],
-      "source": [
-        "endpoint.undeploy_all()\n",
-        "endpoint.delete()"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "model_delete:mbsdk"
-      },
-      "source": [
-        "#### Delete the model\n",
-        "\n",
-        "The method 'delete()' will delete the model."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "model_delete:mbsdk"
-      },
-      "outputs": [],
-      "source": [
-        "model.delete()"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "cleanup"
-      },
-      "source": [
-        "# Cleaning up\n",
-        "\n",
-        "To clean up all Google Cloud resources used in this project, you can [delete the Google Cloud\n",
-        "project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#shutting_down_projects) you used for the tutorial.\n",
-        "\n",
-        "Otherwise, you can delete the individual resources you created in this tutorial.\n"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "cleanup"
-      },
-      "outputs": [],
-      "source": [
-        "# Set this to true only if you'd like to delete your bucket\n",
-        "delete_bucket = False\n",
-        "\n",
-        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
-        "    ! gsutil rm -r $BUCKET_URI"
-      ]
-    }
-  ],
-  "metadata": {
-    "colab": {
-      "name": "get_started_automl_tabular_exported_deploy.ipynb",
-      "toc_visible": true
-    },
-    "kernelspec": {
-      "display_name": "Python 3",
-      "name": "python3"
-    }
-  },
-  "nbformat": 4,
-  "nbformat_minor": 0
-}

notebooks/community/ml_ops/stage6/get_started_with_automl_tabular_exported_deploy.ipynb

@@ -0,0 +1,898 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "copyright"
+   },
+   "outputs": [],
+   "source": [
+    "# Copyright 2022 Google LLC\n",
+    "#\n",
+    "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
+    "# you may not use this file except in compliance with the License.\n",
+    "# You may obtain a copy of the License at\n",
+    "#\n",
+    "#     https://www.apache.org/licenses/LICENSE-2.0\n",
+    "#\n",
+    "# Unless required by applicable law or agreed to in writing, software\n",
+    "# distributed under the License is distributed on an \"AS IS\" BASIS,\n",
+    "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n",
+    "# See the License for the specific language governing permissions and\n",
+    "# limitations under the License."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "title:generic,gcp"
+   },
+   "source": [
+    "# E2E ML on GCP: MLOps stage 6 : serving: get started with re-importing AutoML tabular models\n",
+    "\n",
+    "<table align=\"left\">\n",
+    "  <td>\n",
+    "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage6/get_started_with_automl_tabular_exported_deploy.ipynb\">\n",
+    "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
+    "      View on GitHub\n",
+    "    </a>\n",
+    "  </td>\n",
+    "  <td>\n",
+    "        <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage6/get_started_automl_with_tabular_exported_deploy.ipynb\">\n",
+    "        <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
+    "        </a>\n",
+    "  </td>\n",
+    "  <td>\n",
+    "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/ml_ops/stage6/get_started_automl_with_tabular_exported_deploy.ipynb\">\n",
+    "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
+    "      Open in Vertex AI Workbench\n",
+    "    </a>\n",
+    "  </td>\n",
+    "</table>\n",
+    "<br/><br/><br/>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "overview:mlops"
+   },
+   "source": [
+    "## Overview\n",
+    "\n",
+    "\n",
+    "This tutorial demonstrates how to use Vertex AI for E2E MLOps on Google Cloud in production. This tutorial covers stage 2 : experimentation: get started with AutoML Training."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "objective:mlops,stage2,get_started_automl_training"
+   },
+   "source": [
+    "### Objective\n",
+    "\n",
+    "In this tutorial, you learn how to use `AutoML Tabular` for re-importing exported model artifacts as a `Model` resource. This is useful for example, if one wants to move the exported model across projects.\n",
+    "\n",
+    "This tutorial uses the following Google Cloud ML services:\n",
+    "\n",
+    "- `AutoML Tabular`\n",
+    "- `Vertex AI Model` resource\n",
+    "- `Vertex AI Prediction`\n",
+    "\n",
+    "The steps performed include:\n",
+    "\n",
+    "- Importing a pretrained AutoML tabular exported model artifacts, as a `Model` resource.\n",
+    "- Create an `Endpoint` resource.\n",
+    "- Deploy the `Model` resource to the `Endpoint` resource.\n",
+    "- Make a prediction."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "dataset:flowers,icn"
+   },
+   "source": [
+    "### Dataset\n",
+    "\n",
+    "This tutorial uses a pretrained AutoML tabular model with exported model artifacts.\n",
+    "\n",
+    "\n",
+    "The tabular dataset used for the pretrained model is the GSOD dataset from [BigQuery public datasets](https://cloud.google.com/bigquery/public-data). The version of the dataset you use only the fields year, month and day to predict the value of mean daily temperature (mean_temp).\n",
+    "\n",
+    "*Note:* This version of the exported model contains the custom op and requires the model server: us-docker.pkg.dev/vertex-ai/automl-tabular/prediction-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "fb3451ce8e47"
+   },
+   "source": [
+    "### Costs\n",
+    "This tutorial uses billable components of Google Cloud:\n",
+    "\n",
+    "- Vertex AI\n",
+    "- Cloud Storage\n",
+    "\n",
+    "Learn about [Vertex AI pricing](https://cloud.google.com/vertex-ai/pricing) and [Cloud Storage pricing](https://cloud.google.com/storage/pricing) and use the [Pricing Calculator](https://cloud.google.com/products/calculator/) to generate a cost estimate based on your projected usage."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "install_mlops"
+   },
+   "source": [
+    "## Installations\n",
+    "\n",
+    "Install the packages required for executing this notebook."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "install_mlops"
+   },
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "\n",
+    "# The Vertex AI Workbench Notebook product has specific requirements\n",
+    "IS_WORKBENCH_NOTEBOOK = os.getenv(\"DL_ANACONDA_HOME\") and not os.getenv(\"VIRTUAL_ENV\")\n",
+    "IS_USER_MANAGED_WORKBENCH_NOTEBOOK = os.path.exists(\n",
+    "    \"/opt/deeplearning/metadata/env_version\"\n",
+    ")\n",
+    "\n",
+    "# Vertex AI Notebook requires dependencies to be installed with '--user'\n",
+    "USER_FLAG = \"\"\n",
+    "if IS_WORKBENCH_NOTEBOOK:\n",
+    "    USER_FLAG = \"--user\"\n",
+    "\n",
+    "# Install the packages\n",
+    "\n",
+    "! pip3 install --upgrade google-cloud-aiplatform {USER_FLAG} -q\n",
+    "! pip3 install --upgrade google-cloud-storage {USER_FLAG} -q"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "restart"
+   },
+   "source": [
+    "### Restart the kernel\n",
+    "\n",
+    "Once you've installed the additional packages, you need to restart the notebook kernel so it can find the packages."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "restart"
+   },
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "\n",
+    "if not os.getenv(\"IS_TESTING\"):\n",
+    "    # Automatically restart kernel after installs\n",
+    "    import IPython\n",
+    "\n",
+    "    app = IPython.Application.instance()\n",
+    "    app.kernel.do_shutdown(True)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "project_id"
+   },
+   "source": [
+    "## Before you begin\n",
+    "\n",
+    "### Set up your Google Cloud project\n",
+    "\n",
+    "**The following steps are required, regardless of your notebook environment.**\n",
+    "\n",
+    "1. [Select or create a Google Cloud project](https://console.cloud.google.com/cloud-resource-manager). When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
+    "\n",
+    "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
+    "\n",
+    "1. [Enable the Vertex AI, Compute Engine and Cloud Storage APIs](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component,storage_component).\n",
+    "\n",
+    "1. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
+    "\n",
+    "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
+    "Cloud SDK uses the right project for all the commands in this notebook.\n",
+    "\n",
+    "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$` into these commands."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "56d591439df1"
+   },
+   "source": [
+    "#### Set your project ID\n",
+    "\n",
+    "**If you don't know your project ID**, you may be able to get your project ID using `gcloud`."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "set_project_id"
+   },
+   "outputs": [],
+   "source": [
+    "PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "autoset_project_id"
+   },
+   "outputs": [],
+   "source": [
+    "if PROJECT_ID == \"\" or PROJECT_ID is None or PROJECT_ID == \"[your-project-id]\":\n",
+    "    # Get your GCP project id from gcloud\n",
+    "    shell_output = ! gcloud config list --format 'value(core.project)' 2>/dev/null\n",
+    "    PROJECT_ID = shell_output[0]\n",
+    "    print(\"Project ID:\", PROJECT_ID)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "set_gcloud_project_id"
+   },
+   "outputs": [],
+   "source": [
+    "! gcloud config set project $PROJECT_ID"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "region"
+   },
+   "source": [
+    "#### Region\n",
+    "\n",
+    "You can also change the `REGION` variable, which is used for operations\n",
+    "throughout the rest of this notebook.  Below are regions supported for Vertex AI. We recommend that you choose the region closest to you.\n",
+    "\n",
+    "- Americas: `us-central1`\n",
+    "- Europe: `europe-west4`\n",
+    "- Asia Pacific: `asia-east1`\n",
+    "\n",
+    "You may not use a multi-regional bucket for training with Vertex AI. Not all regions provide support for all Vertex AI services.\n",
+    "\n",
+    "Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations)."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "region"
+   },
+   "outputs": [],
+   "source": [
+    "REGION = \"[your-region]\"  # @param {type: \"string\"}\n",
+    "\n",
+    "if REGION == \"[your-region]\":\n",
+    "    REGION = \"us-central1\""
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "timestamp"
+   },
+   "source": [
+    "#### Timestamp\n",
+    "\n",
+    "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "timestamp"
+   },
+   "outputs": [],
+   "source": [
+    "from datetime import datetime\n",
+    "\n",
+    "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "3ffa6b6c7cdb"
+   },
+   "source": [
+    "### Authenticate your Google Cloud account\n",
+    "\n",
+    "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated. Skip this step.\n",
+    "\n",
+    "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
+    "\n",
+    "**Otherwise**, follow these steps:\n",
+    "\n",
+    "In the Cloud Console, go to the [Create service account key](https://console.cloud.google.com/apis/credentials/serviceaccountkey) page.\n",
+    "\n",
+    "1. **Click Create service account**.\n",
+    "\n",
+    "2. In the **Service account name** field, enter a name, and click **Create**.\n",
+    "\n",
+    "3. In the **Grant this service account access to project** section, click the Role drop-down list. Type \"Vertex AI\" into the filter box, and select **Vertex AI Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
+    "\n",
+    "4. Click Create. A JSON file that contains your key downloads to your local environment.\n",
+    "\n",
+    "5. Enter the path to your service account key as the GOOGLE_APPLICATION_CREDENTIALS variable in the cell below and run the cell."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "2b72272258fc"
+   },
+   "outputs": [],
+   "source": [
+    "# If you are running this notebook in Colab, run this cell and follow the\n",
+    "# instructions to authenticate your GCP account. This provides access to your\n",
+    "# Cloud Storage bucket and lets you submit training jobs and prediction\n",
+    "# requests.\n",
+    "\n",
+    "import os\n",
+    "import sys\n",
+    "\n",
+    "# If on Vertex AI Workbench, then don't execute this code\n",
+    "IS_COLAB = \"google.colab\" in sys.modules\n",
+    "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
+    "    \"DL_ANACONDA_HOME\"\n",
+    "):\n",
+    "    if \"google.colab\" in sys.modules:\n",
+    "        from google.colab import auth as google_auth\n",
+    "\n",
+    "        google_auth.authenticate_user()\n",
+    "\n",
+    "    # If you are running this notebook locally, replace the string below with the\n",
+    "    # path to your service account key and run this cell to authenticate your GCP\n",
+    "    # account.\n",
+    "    elif not os.getenv(\"IS_TESTING\"):\n",
+    "        %env GOOGLE_APPLICATION_CREDENTIALS ''"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "bucket:mbsdk"
+   },
+   "source": [
+    "### Create a Cloud Storage bucket\n",
+    "\n",
+    "**The following steps are required, regardless of your notebook environment.**\n",
+    "\n",
+    "When you initialize the Vertex SDK for Python, you specify a Cloud Storage staging bucket. The staging bucket is where all the data associated with your dataset and model resources are retained across sessions.\n",
+    "\n",
+    "Set the name of your Cloud Storage bucket below. Bucket names must be globally unique across all Google Cloud projects, including those outside of your organization."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "bucket"
+   },
+   "outputs": [],
+   "source": [
+    "BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}\n",
+    "BUCKET_URI = f\"gs://{BUCKET_NAME}\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "autoset_bucket"
+   },
+   "outputs": [],
+   "source": [
+    "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
+    "    BUCKET_NAME = PROJECT_ID + \"aip-\" + TIMESTAMP\n",
+    "    BUCKET_URI = \"gs://\" + BUCKET_NAME"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "create_bucket"
+   },
+   "source": [
+    "**Only if your bucket doesn't already exist**: Run the following cell to create your Cloud Storage bucket."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "create_bucket"
+   },
+   "outputs": [],
+   "source": [
+    "! gsutil mb -l $REGION $BUCKET_URI"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "validate_bucket"
+   },
+   "source": [
+    "Finally, validate access to your Cloud Storage bucket by examining its contents:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "validate_bucket"
+   },
+   "outputs": [],
+   "source": [
+    "! gsutil ls -al $BUCKET_URI"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "setup_vars"
+   },
+   "source": [
+    "### Set up variables\n",
+    "\n",
+    "Next, set up some variables used throughout the tutorial.\n",
+    "### Import libraries and define constants"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "import_aip:mbsdk"
+   },
+   "outputs": [],
+   "source": [
+    "import google.cloud.aiplatform as aiplatform"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "init_aip:mbsdk"
+   },
+   "source": [
+    "### Initialize Vertex AI SDK for Python\n",
+    "\n",
+    "Initialize the Vertex AI SDK for Python for your project and corresponding bucket."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "init_aip:mbsdk"
+   },
+   "outputs": [],
+   "source": [
+    "aiplatform.init(project=PROJECT_ID, staging_bucket=BUCKET_URI)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "machine:training"
+   },
+   "source": [
+    "#### Set machine type\n",
+    "\n",
+    "Next, set the machine type to use for training.\n",
+    "\n",
+    "- Set the variable `DEPLOY_COMPUTE` to configure  the compute resources for the VMs you will use for for training.\n",
+    " - `machine type`\n",
+    "     - `n1-standard`: 3.75GB of memory per vCPU.\n",
+    "     - `n1-highmem`: 6.5GB of memory per vCPU\n",
+    "     - `n1-highcpu`: 0.9 GB of memory per vCPU\n",
+    " - `vCPUs`: number of \\[2, 4, 8, 16, 32, 64, 96 \\]\n",
+    "\n",
+    "*Note: The following is not supported for training:*\n",
+    "\n",
+    " - `standard`: 2 vCPUs\n",
+    " - `highcpu`: 2, 4 and 8 vCPUs\n",
+    "\n",
+    "*Note: You may also use n2 and e2 machine types for training and deployment, but they do not support GPUs*."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "machine:training"
+   },
+   "outputs": [],
+   "source": [
+    "if os.getenv(\"IS_TESTING_DEPLOY_MACHINE\"):\n",
+    "    MACHINE_TYPE = os.getenv(\"IS_TESTING_DEPLOY_MACHINE\")\n",
+    "else:\n",
+    "    MACHINE_TYPE = \"n1-standard\"\n",
+    "\n",
+    "VCPU = \"4\"\n",
+    "DEPLOY_COMPUTE = MACHINE_TYPE + \"-\" + VCPU\n",
+    "print(\"Train machine type\", DEPLOY_COMPUTE)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "import_file:u_dataset,csv"
+   },
+   "source": [
+    "### Location of pretrained `AutoML Tabular` exported model\n",
+    "\n",
+    "Now set the variable `MODEL_PACKAGE` to the location of the exported model artifacts in Cloud Storage."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "import_file:flowers,csv,icn"
+   },
+   "outputs": [],
+   "source": [
+    "MODEL_PACKAGE = \"gs://cloud-samples-data/vertex-ai/tabular-workflows/models/custom_op\""
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "quick_peek:csv"
+   },
+   "source": [
+    "#### Quick peek at your model package.\n",
+    "\n",
+    "Next, take a look at the contents of the model package for the exported AutoML tabular model."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "quick_peek:csv"
+   },
+   "outputs": [],
+   "source": [
+    "! gsutil ls {MODEL_PACKAGE}"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "automl_tabular_intro"
+   },
+   "source": [
+    "## AutoML tabular models\n",
+    "\n",
+    "AutoML can train the following types of tabular models:\n",
+    "\n",
+    "- classification\n",
+    "- regression\n",
+    "- forecasting\n",
+    "\n",
+    "A model can be trained for either automatic deployment to the cloud or exported for manual deployment to the cloud. In this tutorial, you use a pretrained exported AutoML tabular model.\n",
+    "\n",
+    "Learn more about [AutoML Model Types](https://cloud.google.com/vertex-ai/docs/start/automl-model-types)\n",
+    "\n",
+    "Learn more about [Exporting AutoML Tabular models](https://cloud.google.com/vertex-ai/docs/export/export-model-tabular)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "c10efb34321b"
+   },
+   "source": [
+    "### Set the model server\n",
+    "\n",
+    "Next, you set the pre-built container for the model server. The container will be a version of `us-docker.pkg.dev/vertex-ai/automl-tabular/prediction-server`. If the model package contains an `environment.json` file, use the container version specified by the key `container_uri`; otherwise, use `us-docker.pkg.dev/vertex-ai/automl-tabular/prediction-server:latest` "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "a5f271de9040"
+   },
+   "outputs": [],
+   "source": [
+    "import json\n",
+    "\n",
+    "output = !gsutil cat {MODEL_PACKAGE}/environment.json\n",
+    "\n",
+    "MODEL_SERVER = json.loads(output[0])[\"container_uri\"]"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "e8ce91147c93"
+   },
+   "source": [
+    "### Upload the pretrained exported `AutoML Tabular` model package to a `Vertex AI Model` resource\n",
+    "\n",
+    "Next, you upload the model artifacts for the pretrained exported `AutoML Tabular` model into a `Vertex AI Model` resource, using the `Model.upload()` method with the following parameters:\n",
+    "\n",
+    "- `display_name`: A human readable name for the `Model` resource.\n",
+    "- `artifact_uri`: The Cloud Storage location of the model package.\n",
+    "- `serving_container_image_uri`: The serving container image.\n",
+    "- `serving_container_ports`: The serving port.\n",
+    "\n",
+    "*Note:* When you upload the model artifacts to a `Vertex Model` resource, you specify the corresponding deployment container image."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "7988eae27f80"
+   },
+   "outputs": [],
+   "source": [
+    "model = aiplatform.Model.upload(\n",
+    "    display_name=\"gsod_\" + TIMESTAMP,\n",
+    "    artifact_uri=MODEL_PACKAGE,\n",
+    "    serving_container_image_uri=MODEL_SERVER,\n",
+    "    serving_container_ports=[8080],\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "628de0914ba1"
+   },
+   "source": [
+    "## Creating an `Endpoint` resource\n",
+    "\n",
+    "You create an `Endpoint` resource using the `Endpoint.create()` method. At a minimum, you specify the display name for the endpoint. Optionally, you can specify the project and location (region); otherwise the settings are inherited by the values you set when you initialized the Vertex AI SDK with the `init()` method.\n",
+    "\n",
+    "In this example, the following parameters are specified:\n",
+    "\n",
+    "- `display_name`: A human readable name for the `Endpoint` resource.\n",
+    "- `project`: Your project ID.\n",
+    "- `location`: Your region.\n",
+    "- `labels`: (optional) User defined metadata for the `Endpoint` in the form of key/value pairs.\n",
+    "\n",
+    "This method returns an `Endpoint` object.\n",
+    "\n",
+    "Learn more about [Vertex AI Endpoints](https://cloud.google.com/vertex-ai/docs/predictions/deploy-model-api)."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "0ea443f9593b"
+   },
+   "outputs": [],
+   "source": [
+    "endpoint = aiplatform.Endpoint.create(\n",
+    "    display_name=\"gsod_\" + TIMESTAMP,\n",
+    "    project=PROJECT_ID,\n",
+    "    location=REGION,\n",
+    "    labels={\"your_key\": \"your_value\"},\n",
+    ")\n",
+    "\n",
+    "print(endpoint)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "ca3fa3f6a894"
+   },
+   "source": [
+    "## Deploying `Model` resources to an `Endpoint` resource.\n",
+    "\n",
+    "You can deploy one of more `Vertex AI Model` resource instances to the same endpoint. Each `Vertex AI Model` resource that is deployed will have its own deployment container for the serving binary. \n",
+    "\n",
+    "*Note:* For this example, you specified the deployment container for the exported AutoML Tabular model in the previous step of uploading the model artifacts to a `Vertex AI Model` resource.\n",
+    "\n",
+    "To deploy, you specify the following additional configuration settings:\n",
+    "\n",
+    "- The machine type.\n",
+    "- The (if any) type and number of GPUs.\n",
+    "- Static, manual or auto-scaling of VM instances.\n",
+    "\n",
+    "In this example, you deploy the model with the minimal amount of specified parameters, as follows:\n",
+    "\n",
+    "- `model`: The `Model` resource.\n",
+    "- `deployed_model_displayed_name`: The human readable name for the deployed model instance.\n",
+    "- `machine_type`: The machine type for each VM instance.\n",
+    "\n",
+    "Do to the requirements to provision the resource, this may take upto a few minutes."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "4e93b034a72f"
+   },
+   "outputs": [],
+   "source": [
+    "response = endpoint.deploy(\n",
+    "    model=model,\n",
+    "    deployed_model_display_name=\"gsod_\" + TIMESTAMP,\n",
+    "    machine_type=DEPLOY_COMPUTE,\n",
+    ")\n",
+    "\n",
+    "print(response)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "f75331c946d5"
+   },
+   "source": [
+    "## Make a prediction\n",
+    "\n",
+    "Finally, you make an online prediction using the `endpoint()` method, with the following parameters:\n",
+    "\n",
+    "- `instances`: The instances to predict.\n",
+    "\n",
+    "The following is the for a prediction request:\n",
+    "\n",
+    "    [ INSTANCE_1, INSTANCE_2, ... ]\n",
+    "    \n",
+    "    INSTANCE : { \"column_1\": value, \"column_2\": value, ... }\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "72683bd9d777"
+   },
+   "outputs": [],
+   "source": [
+    "INSTANCES = [{\"year\": \"2020\", \"month\": \"1\", \"day\": \"23\"}]\n",
+    "\n",
+    "prediction = endpoint.predict(instances=INSTANCES)\n",
+    "print(prediction)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "endpoint_delete:mbsdk"
+   },
+   "source": [
+    "#### Delete the endpoint\n",
+    "\n",
+    "The method 'delete()' will delete the endpoint."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "endpoint_delete:mbsdk"
+   },
+   "outputs": [],
+   "source": [
+    "endpoint.undeploy_all()\n",
+    "endpoint.delete()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "model_delete:mbsdk"
+   },
+   "source": [
+    "#### Delete the model\n",
+    "\n",
+    "The method 'delete()' will delete the model."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "model_delete:mbsdk"
+   },
+   "outputs": [],
+   "source": [
+    "model.delete()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "cleanup"
+   },
+   "source": [
+    "# Cleaning up\n",
+    "\n",
+    "To clean up all Google Cloud resources used in this project, you can [delete the Google Cloud\n",
+    "project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#shutting_down_projects) you used for the tutorial.\n",
+    "\n",
+    "Otherwise, you can delete the individual resources you created in this tutorial.\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "cleanup"
+   },
+   "outputs": [],
+   "source": [
+    "# Set this to true only if you'd like to delete your bucket\n",
+    "delete_bucket = False\n",
+    "\n",
+    "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
+    "    ! gsutil rm -r $BUCKET_URI"
+   ]
+  }
+ ],
+ "metadata": {
+  "colab": {
+   "name": "get_started_automl_tabular_exported_deploy.ipynb",
+   "toc_visible": true
+  },
+  "environment": {
+   "kernel": "python3",
+   "name": "common-cpu.m95",
+   "type": "gcloud",
+   "uri": "gcr.io/deeplearning-platform-release/base-cpu:m95"
+  },
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.12"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}

notebooks/community/ml_ops/stage6/get_started_with_matching_engine_swivel.ipynb

@@ -1068,7 +1068,7 @@
         "model = aiplatform.Model.upload(\n",
         "    display_name=\"movies_\" + TIMESTAMP,\n",
         "    artifact_uri=SAVEDMODEL_DIR,\n",
-        "    serving_container_image_uri=DELOY_IMAGE,\n",
+        "    serving_container_image_uri=DEPLOY_IMAGE,\n",
         ")"
       ]
     },

notebooks/community/ml_ops/stage6/get_started_with_nvidia_triton_serving.ipynb

@@ -81,7 +81,7 @@
       "source": [
         "### Objective\n",
         "\n",
-        "In this tutorial, you deploy a container running Nvidia Triton Server with a `Vertex AI Model` resource to a `Vertex AI Endpoint` for making online predictions.\n",
+        "In this tutorial, you learn how to deploy a container running Nvidia Triton Server with a `Vertex AI Model` resource to a `Vertex AI Endpoint` for making online predictions.\n",
         "\n",
         "This tutorial uses the following Google Cloud ML services:\n",
         "\n",

notebooks/community/ml_ops/stage6/get_started_with_tf_serving.ipynb

@@ -702,7 +702,7 @@
         "        + f\"/{PRIVATE_REPO}\"\n",
         "        + \"/tf_serving:gpu\"\n",
         "    )\n",
-        "    TF_IMAGE = \"tensorflow/serving:latest-gpu\"\n",
+        "    TF_IMAGE = \"tensorflow/serving:2.5.4-gpu\"\n",
         "else:\n",
         "    DEPLOY_IMAGE = (\n",
         "        f\"{REGION}-docker.pkg.dev/\"\n",
@@ -710,15 +710,15 @@
         "        + f\"/{PRIVATE_REPO}\"\n",
         "        + \"/tf_serving:cpu\"\n",
         "    )\n",
-        "    TF_IMAGE = \"tensorflow/serving:latest\"\n",
+        "    TF_IMAGE = \"tensorflow/serving:2.5.4\"\n",
         "\n",
         "if not IS_COLAB:\n",
         "    if DEPLOY_GPU:\n",
-        "        ! sudo docker pull tensorflow/serving:latest-gpu\n",
+        "        ! sudo docker pull tensorflow/serving:2.5.4-gpu\n",
         "    else:\n",
-        "        ! sudo docker pull tensorflow/serving:latest\n",
+        "        ! sudo docker pull tensorflow/serving:2.5.4\n",
         "\n",
-        "    ! docker tag tensorflow/serving $DEPLOY_IMAGE\n",
+        "    ! docker tag $TF_IMAGE $DEPLOY_IMAGE\n",
         "    ! docker push $DEPLOY_IMAGE\n",
         "else:\n",
         "    # install docker daemon\n",
@@ -1214,6 +1214,20 @@
         "     [1.0,3.0,\"cat1\"],\n",
         "     [2.0,4.0,\"cat2\"]\n",
         "    ]}\n",
+        "    \n",
+        "**BigQuery**\n",
+        "\n",
+        "Each row is converted to a JSON array. For example:\n",
+        "\n",
+        "    [1.0,3.0,\"cat1\"]\n",
+        "    [2.0,4.0,\"cat2\"]\n",
+        "    \n",
+        "The batch server generates the pivot data with the same format. The generated pivot data is then wrapped into a payload request:\n",
+        "\n",
+        "    {\"instances\": [\n",
+        "     [1.0,3.0,\"cat1\"],\n",
+        "     [2.0,4.0,\"cat2\"]\n",
+        "    ]}\n",
         "\n",
         "**TFRecords**\n",
         "\n",
@@ -1420,7 +1434,7 @@
       },
       "outputs": [],
       "source": [
-        "delete_bucket = False\n",
+        "delete_bucket = True\n",
         "delete_model = True\n",
         "delete_endpoint = True\n",
         "delete_batch_job = True\n",

notebooks/community/ml_ops/stage7/README.md

@@ -34,3 +34,69 @@ This stage may be done entirely by MLOps. We recommend:
 ## Notebooks
 
 ### Get Started
+
+[Vertex AI Model Monitoring for custom tabular models with TensorFlow Serving container](community/ml_ops/stage7/get_started_with_model_monitoring_custom_tf_serving.ipynb)
+
+In this notebook, you learn to use the `Vertex AI Model Monitoring` service to detect feature skew and drift in the input predict requests, for custom tabular models, using a custom deployment container. 
+
+The steps performed include:
+
+- Download a pre-trained custom tabular model.
+- Upload the pre-trained model as a `Model` resource.
+- Deploying the `Model` resource to an `Endpoint` resource with `TensorFlow Serving` serving binary.
+- Configure the `Endpoint` resource for model monitoring.
+- Generate synthetic prediction requests for skew.
+- Wait for email alert notification.
+- Generate synthetic prediction requests for drift.
+- Wait for email alert notification.
+
+
+
+[Vertex AI Model Monitoring for AutoML tabular models](community/ml_ops/stage7/get_started_with_model_monitoring_automl.ipynb)
+
+In this notebook, you learn to use the `Vertex AI Model Monitoring` service to detect feature skew and drift in the input predict requests, for AutoML tabular models.
+
+The steps performed include:
+
+- Train an `AutoML` model.
+- Deploy the `Model` resource to the `Endpoint` resource.
+- Configure the `Endpoint` resource for model monitoring.
+- Generate synthetic prediction requests for skew.
+- Wait for email alert notification.
+- Generate synthetic prediction requests for drift.
+- Wait for email alert notification.
+
+
+[Vertex AI Model Monitoring for custom tabular models](community/ml_ops/stage7/get_started_with_model_monitoring_custom.ipynb)
+
+In this notebook, you learn to use the `Vertex AI Model Monitoring` service to detect feature skew and drift in the input predict requests, for custom tabular models.
+
+The steps performed include:
+
+- Download a pre-trained custom tabular model.
+- Upload the pre-trained model as a `Model` resource.
+- Deploy the `Model` resource to the `Endpoint` resource.
+- Configure the `Endpoint` resource for model monitoring.
+- Generate synthetic prediction requests for skew.
+- Wait for email alert notification.
+- Generate synthetic prediction requests for drift.
+- Wait for email alert notification.
+
+
+
+[Vertex AI Model Monitoring for setup for tabular models](community/ml_ops/stage7/get_started_with_model_monitoring_setup.ipynb)
+
+In this notebook, you learn to setup the `Vertex AI Model Monitoring` service to detect feature skew and drift in the input predict requests.
+
+The steps performed include:
+
+- Download a pre-trained custom tabular model.
+- Upload the pre-trained model as a `Model` resource.
+- Deploy the `Model` resource to the `Endpoint` resource.
+- Configure the `Endpoint` resource for model monitoring.
+    - Skew and drift detection for feature inputs.
+    - Skew and drift detection for feature attributions.
+- Automatic generation of the `input schema` by sending 1000 prediction request.
+- List, pause, resume and delete monitoring jobs.
+- Restart monitoring job with predefined `input schema`.
+- View logged monitored data.

notebooks/community/model_monitoring/batch_prediction_model_monitoring.ipynb

@@ -3,7 +3,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "d3069d95",
       "metadata": {
         "cellView": "form",
         "id": "d3069d95"
@@ -11,7 +10,7 @@
       "outputs": [],
       "source": [
         "# @title Copyright & License (click to expand)\n",
-        "# Copyright 2021 Google LLC\n",
+        "# Copyright 2022 Google LLC\n",
         "#\n",
         "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
         "# you may not use this file except in compliance with the License.\n",
@@ -28,7 +27,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "546c53de",
       "metadata": {
         "id": "546c53de"
       },
@@ -46,13 +44,16 @@
         "        <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
-        "  </td>\n",
+        "  </td><td>\n",
+        "    <a href=\"https://console.cloud.google.com/ai-platform/notebooks/deploy-notebook?name=Model%20Monitoring&download_url=https%3A%2F%2Fraw.githubusercontent.com%2FGoogleCloudPlatform%2Fvertex-ai-samples%2Fmain%2Fnotebooks%2Fcommunity%2Fmodel_monitoring%2Fbatch_prediction_model_monitoring.ipynb\">\n",
+        "       <img src=\"https://www.gstatic.com/cloud/images/navigation/vertex-ai.svg\" alt=\"Google Cloud Notebooks\">Open in Workbench AI Notebook\n",
+        "    </a>\n",
+        "  </td> \n",
         "</table>"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "53fd1070",
       "metadata": {
         "id": "53fd1070"
       },
@@ -64,7 +65,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "8b26c855",
       "metadata": {
         "id": "8b26c855"
       },
@@ -98,7 +98,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "d52ba95b",
       "metadata": {
         "id": "d52ba95b"
       },
@@ -110,7 +109,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "e64fb18a",
       "metadata": {
         "id": "e64fb18a"
       },
@@ -123,7 +121,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "9d839347",
       "metadata": {
         "id": "9d839347"
       },
@@ -142,7 +139,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "738fce1f",
       "metadata": {
         "id": "738fce1f"
       },
@@ -155,7 +151,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "4536fe4e",
       "metadata": {
         "id": "4536fe4e"
       },
@@ -178,14 +173,13 @@
         "    USER_FLAG = \"--user\"\n",
         "\n",
         "# Install Python package dependencies.\n",
-        "! pip3 install -q tensorflow-data-validation $USER_FLAG\n",
-        "! pip3 install -q google-api-core $USER_FLAG\n",
-        "! pip3 install -q google-cloud-aiplatform $USER_FLAG"
+        "! pip3 install -q {USER_FLAG} tensorflow-data-validation \\\n",
+        "                              google-api-core \\\n",
+        "                              google-cloud-aiplatform"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "6e98402b",
       "metadata": {
         "id": "6e98402b"
       },
@@ -198,7 +192,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "9775c9ff",
       "metadata": {
         "id": "9775c9ff"
       },
@@ -217,13 +210,16 @@
     },
     {
       "cell_type": "markdown",
-      "id": "d5737134",
       "metadata": {
         "id": "d5737134"
       },
       "source": [
         "### Set up your Google Cloud project\n",
         "\n",
+        "**_NOTE_**: This notebook has been tested in the following environment:\n",
+        "\n",
+        "* Python version = 3.7\n",
+        "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
         "1. [Select or create a Google Cloud project](https://console.cloud.google.com/cloud-resource-manager). When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
@@ -242,7 +238,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "cfb1a1d5",
       "metadata": {
         "id": "cfb1a1d5"
       },
@@ -255,50 +250,33 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "cf8535e4",
       "metadata": {
         "id": "cf8535e4"
       },
       "outputs": [],
       "source": [
-        "import os\n",
-        "\n",
-        "PROJECT_ID = \"\"\n",
-        "\n",
-        "# Get your Google Cloud project ID from gcloud\n",
-        "if not os.getenv(\"IS_TESTING\"):\n",
-        "    shell_output = ! gcloud config list --format 'value(core.project)' 2>/dev/null\n",
-        "    PROJECT_ID = shell_output[0]\n",
-        "    print(\"Project ID: \", PROJECT_ID)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "id": "05a2d397",
-      "metadata": {
-        "id": "05a2d397"
-      },
-      "source": [
-        "Otherwise, set your project ID here.\n"
+        "PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}"
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "1c2be4bd",
       "metadata": {
         "id": "1c2be4bd"
       },
       "outputs": [],
       "source": [
-        "if PROJECT_ID == \"\" or PROJECT_ID is None:\n",
-        "    PROJECT_ID = \"python-docs-samples-tests\"  # @param {type:\"string\"}"
+        "if PROJECT_ID == \"\" or not PROJECT_ID or PROJECT_ID == \"[your-project-id]\":\n",
+        "    PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}\n",
+        "    # Get your GCP project id from gcloud\n",
+        "    shell_output = ! gcloud config list --format 'value(core.project)' 2>/dev/null\n",
+        "    PROJECT_ID = shell_output[0]\n",
+        "    print(\"Project ID:\", PROJECT_ID)"
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "c129705c",
       "metadata": {
         "id": "c129705c"
       },
@@ -309,32 +287,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "71404c9f",
-      "metadata": {
-        "id": "71404c9f"
-      },
-      "source": [
-        "#### Set your email address\n",
-        "This is used for delivering model monitoring notifications.\n"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "id": "4b1d2b69",
-      "metadata": {
-        "id": "4b1d2b69"
-      },
-      "outputs": [],
-      "source": [
-        "EMAIL_ADDRESS = \"[your-email-address]\"  # @param {type:\"string\"}\n",
-        "if not EMAIL_ADDRESS or EMAIL_ADDRESS == \"[your-email-address]\":\n",
-        "    print(\"EMAIL_ADDRESS not specified, please correct before proceeding.\")"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "id": "83340af4",
       "metadata": {
         "id": "83340af4"
       },
@@ -356,18 +308,73 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "4814ea21",
       "metadata": {
         "id": "4814ea21"
       },
       "outputs": [],
       "source": [
-        "REGION = \"us-central1\"  # @param {type: \"string\"}"
+        "REGION = \"[your-region]\"  # @param {type: \"string\"}\n",
+        "\n",
+        "if REGION == \"[your-region]\":\n",
+        "    REGION = \"us-central1\""
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "06571eb4063b"
+      },
+      "source": [
+        "#### UUID\n",
+        "\n",
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "4e166d927e36"
+      },
+      "outputs": [],
+      "source": [
+        "import random\n",
+        "import string\n",
+        "\n",
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "71404c9f"
+      },
+      "source": [
+        "#### Set your email address\n",
+        "This is used for delivering model monitoring notifications.\n"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "4b1d2b69"
+      },
+      "outputs": [],
+      "source": [
+        "EMAIL_ADDRESS = \"[your-email-address]\"  # @param {type:\"string\"}\n",
+        "if not EMAIL_ADDRESS or EMAIL_ADDRESS == \"[your-email-address]\":\n",
+        "    print(\"EMAIL_ADDRESS not specified, please correct before proceeding.\")"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "20a546c3",
       "metadata": {
         "id": "20a546c3"
       },
@@ -375,16 +382,35 @@
         "### Authenticate your Google Cloud account\n",
         "\n",
         "**If you are using Vertex AI Workbench notebooks**, your environment is already\n",
-        "authenticated. Skip this step.\n",
+        "authenticated.\n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions\n",
-        "when prompted to authenticate your account via oAuth.\n"
+        "when prompted to authenticate your account via oAuth.\n",
+        "\n",
+        "**Otherwise**, follow these steps:\n",
+        "\n",
+        "1. In the Cloud Console, go to the [**Create service account key**\n",
+        "   page](https://console.cloud.google.com/apis/credentials/serviceaccountkey).\n",
+        "\n",
+        "2. Click **Create service account**.\n",
+        "\n",
+        "3. In the **Service account name** field, enter a name, and\n",
+        "   click **Create**.\n",
+        "\n",
+        "4. In the **Grant this service account access to project** section, click the **Role** drop-down list. Type \"Vertex AI\"\n",
+        "into the filter box, and select\n",
+        "   **Vertex AI Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
+        "\n",
+        "5. Click **Create**. A JSON file that contains your key downloads to your\n",
+        "local environment.\n",
+        "\n",
+        "6. Enter the path to your service account key as the\n",
+        "`GOOGLE_APPLICATION_CREDENTIALS` variable in the cell below and run the cell."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "06c51076",
       "metadata": {
         "id": "06c51076"
       },
@@ -421,73 +447,284 @@
     },
     {
       "cell_type": "markdown",
-      "id": "6b01af18",
       "metadata": {
-        "id": "6b01af18"
+        "id": "bucket:custom"
       },
       "source": [
-        "### Upload the model\n",
+        "### Create a Cloud Storage bucket\n",
         "\n",
-        "The churn propensity model you'll be using in this notebook has been trained in BigQuery ML and exported to a Google Cloud Storage bucket. This illustrates how you can easily export a trained model and move a model from one cloud service to another. \n",
+        "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "Next, import the model. **If you've already imported your model, you can skip this step.**"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "id": "9638ad2c",
-      "metadata": {
-        "id": "9638ad2c"
-      },
-      "source": [
-        "<span id=\"papermill-error-cell\" style=\"color:red; font-family:Helvetica Neue, Helvetica, Arial, sans-serif; font-size:2em;\">Execution using papermill encountered an exception here and stopped:</span>"
+        "Set the name of your Cloud Storage bucket below, which you use in this tutorial to upload the `input schema` for the monitoring service.\n",
+        "\n",
+        "Bucket names must be globally unique across all Google Cloud projects, including those outside of your organization."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "926e3ba8",
       "metadata": {
-        "id": "926e3ba8"
+        "id": "bucket"
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
-        "import json\n",
-        "import time\n",
-        "import re\n",
-        "import tensorflow as tf\n",
+        "BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}\n",
+        "BUCKET_URI = f\"gs://{BUCKET_NAME}\""
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "autoset_bucket"
+      },
+      "outputs": [],
+      "source": [
+        "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
+        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + UUID\n",
+        "    BUCKET_URI = \"gs://\" + BUCKET_NAME"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "create_bucket"
+      },
+      "source": [
+        "**Only if your bucket doesn't already exist**: Run the following cell to create your Cloud Storage bucket."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "create_bucket"
+      },
+      "outputs": [],
+      "source": [
+        "! gsutil mb -l $REGION $BUCKET_URI"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "validate_bucket"
+      },
+      "source": [
+        "Finally, validate access to your Cloud Storage bucket by examining its contents:"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "validate_bucket"
+      },
+      "outputs": [],
+      "source": [
+        "! gsutil ls -al $BUCKET_URI"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "a0d294ff6d10"
+      },
+      "source": [
+        "### Import libraries"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "bd7a633296eb"
+      },
+      "outputs": [],
+      "source": [
+        "import google.cloud.aiplatform as aiplatform\n",
         "import tensorflow_data_validation as tfdv\n",
-        "from tensorflow_data_validation.utils import io_util \n",
-        "from tensorflow_metadata.proto.v0 import statistics_pb2\n",
-        "\n",
-        "MODEL_DISPLAY_NAME=f\"batch_prediction_monitoring_test_model_{datetime.now().strftime('%Y%m%d%H%M%S')}\"\n",
-        "CONTAINER_IMAGE_URI=\"us-docker.pkg.dev/cloud-aiplatform/prediction/tf2-cpu.2-4:latest\"\n",
-        "ARTIFACT_URI=\"gs://mco-mm/churn\"\n",
-        "\n",
-        "output = ! gcloud ai models upload \\\n",
-        "  --region=$REGION \\\n",
-        "  --display-name=$MODEL_DISPLAY_NAME \\\n",
-        "  --artifact-uri=$ARTIFACT_URI \\\n",
-        "  --container-image-uri=$CONTAINER_IMAGE_URI \\\n",
-        "  --format=\"value(model)\"\n",
-        "MODEL_ID = output[1].split(\"/\")[5]\n",
-        "print(f\"Model {MODEL_ID} created.\")"
+        "from tensorflow_data_validation.utils import io_util\n",
+        "from tensorflow_metadata.proto.v0 import statistics_pb2"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "init_aip:mbsdk,all"
+      },
+      "source": [
+        "### Initialize Vertex AI SDK for Python\n",
+        "\n",
+        "Initialize the Vertex AI SDK for Python for your project and corresponding bucket."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "init_aip:mbsdk,all"
+      },
+      "outputs": [],
+      "source": [
+        "aiplatform.init(project=PROJECT_ID, location=REGION)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "accelerators:training,prediction"
+      },
+      "source": [
+        "#### Set hardware accelerators\n",
+        "\n",
+        "You can set hardware accelerators for prediction (e.g., GPUs) or choose not to use any (CPU). Hardware accelertors lower the latency response for a prediction request. When choosing a hardware accelerators, consider the additional cost trade-off over latency.\n",
+        "\n",
+        "Set the variables `DEPLOY_GPU/DEPLOY_NGPU` to use a container image supporting a GPU and the number of GPUs allocated to the virtual machine (VM) instance. For example, to use a GPU container image with 4 Nvidia Tesla K80 GPUs allocated to each VM, you would specify:\n",
+        "\n",
+        "    (aiplatform.gapic.AcceleratorType.NVIDIA_TESLA_K80, 4)\n",
+        "\n",
+        "See the [locations where accelerators are available](https://cloud.google.com/vertex-ai/docs/general/locations#accelerators).\n",
+        "\n",
+        "Otherwise specify `(None, None)` to use a container image to run on a CPU."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "xd5PLXDTlugv"
+      },
+      "outputs": [],
+      "source": [
+        "GPU = False\n",
+        "if GPU:\n",
+        "    DEPLOY_GPU, DEPLOY_NGPU = (aiplatform.gapic.AcceleratorType.NVIDIA_TESLA_K80, 1)\n",
+        "else:\n",
+        "    DEPLOY_GPU, DEPLOY_NGPU = (None, None)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "container:training,prediction"
+      },
+      "source": [
+        "#### Set pre-built containers\n",
+        "\n",
+        "Set the pre-built Docker container image for prediction.\n",
+        "\n",
+        "For the latest list, see [Pre-built containers for prediction](https://cloud.google.com/ai-platform-unified/docs/predictions/pre-built-containers)."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "1u1mr18jlugv"
+      },
+      "outputs": [],
+      "source": [
+        "if GPU:\n",
+        "    DEPLOY_VERSION = \"tf2-gpu.2-5\"\n",
+        "else:\n",
+        "    DEPLOY_VERSION = \"tf2-cpu.2-5\"\n",
+        "\n",
+        "DEPLOY_IMAGE = \"{}-docker.pkg.dev/vertex-ai/prediction/{}:latest\".format(\n",
+        "    REGION.split(\"-\")[0], DEPLOY_VERSION\n",
+        ")\n",
+        "\n",
+        "print(\"Deployment:\", DEPLOY_IMAGE, DEPLOY_GPU, DEPLOY_NGPU)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "machine:training,prediction"
+      },
+      "source": [
+        "#### Set machine types\n",
+        "\n",
+        "Next, set the machine types to use for training and prediction.\n",
+        "\n",
+        "- Set the variable `DEPLOY_COMPUTE` to configure your compute resources for prediction.\n",
+        " - `machine type`\n",
+        "     - `n1-standard`: 3.75GB of memory per vCPU\n",
+        "     - `n1-highmem`: 6.5GB of memory per vCPU\n",
+        "     - `n1-highcpu`: 0.9 GB of memory per vCPU\n",
+        " - `vCPUs`: number of \\[2, 4, 8, 16, 32, 64, 96 \\]\n",
+        "\n",
+        "*Note: You may also use n2 and e2 machine types for training and deployment, but they do not support GPUs*."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "YAXwbqKKlugv"
+      },
+      "outputs": [],
+      "source": [
+        "MACHINE_TYPE = \"n1-standard\"\n",
+        "\n",
+        "VCPU = \"4\"\n",
+        "TRAIN_COMPUTE = MACHINE_TYPE + \"-\" + VCPU\n",
+        "print(\"Train machine type\", TRAIN_COMPUTE)\n",
+        "\n",
+        "MACHINE_TYPE = \"n1-standard\"\n",
+        "\n",
+        "VCPU = \"4\"\n",
+        "DEPLOY_COMPUTE = MACHINE_TYPE + \"-\" + VCPU\n",
+        "print(\"Deploy machine type\", DEPLOY_COMPUTE)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "9bf06cd476e9"
+      },
+      "source": [
+        "### Upload the model artifacts as a `Vertex AI Model` resource\n",
+        "\n",
+        "First, you upload the pre-trained custom tabular model artifacts as a `Vertex AI Model` resource using the `upload()` method, with the following parameters:\n",
+        "\n",
+        "- `display_name`: The human readable name for the `Model` resource.\n",
+        "- `artifact_uri`: The Cloud Storage location of the model artifacts.\n",
+        "- `serving_container_image`: The serving container image to use when the model is deployed to a `Vertex AI Endpoint` resource.\n",
+        "- `sync`: Whether to wait for the process to complete, or return immediately (async)."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "0193f247e216"
+      },
+      "outputs": [],
+      "source": [
+        "MODEL_ARTIFACT_URI = \"gs://mco-mm/churn\"\n",
+        "\n",
+        "model = aiplatform.Model.upload(\n",
+        "    display_name=\"churn_\" + UUID,\n",
+        "    artifact_uri=MODEL_ARTIFACT_URI,\n",
+        "    serving_container_image_uri=DEPLOY_IMAGE,\n",
+        "    sync=True,\n",
+        ")\n",
+        "\n",
+        "print(model)"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "a4305ddf",
       "metadata": {
         "id": "a4305ddf"
       },
       "source": [
-        "## Submit a batch prediction request with model monitoring enabled"
+        "## Submit a batch prediction request with model monitoring enabled\n"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "053fde99",
       "metadata": {
         "id": "053fde99"
       },
@@ -503,7 +740,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "b832ad31",
       "metadata": {
         "id": "b832ad31"
       },
@@ -511,20 +747,17 @@
       "source": [
         "# Copy files to your projects gs bucket to avoid permission issues.\n",
         "# Ignore any error(s) for bucket already exists.\n",
-        "OUTPUT_GS_PATH = f\"gs://{PROJECT_ID.replace('-', '_')}_bp_mm_output\"\n",
-        "INPUT_GS_PATH = f\"gs://{PROJECT_ID.replace('-', '_')}_bp_mm_input\"\n",
+        "OUTPUT_GS_PATH = f\"{BUCKET_URI}/bp_mm_output\"\n",
+        "INPUT_GS_PATH = f\"{BUCKET_URI}/bp_mm_input\"\n",
         "PUBLIC_TRAINING_DATASET = \"gs://bp_mm_public_data/churn/churn_bp_insample.csv\"\n",
         "TRAINING_DATASET = f\"{INPUT_GS_PATH}/churn_bp_insample.csv\"\n",
         "TRAINING_DATASET_FORMAT = \"csv\"\n",
         "\n",
-        "! gsutil mb -p {PROJECT_ID} -l {REGION} -b on {INPUT_GS_PATH}\n",
-        "! gsutil mb -p {PROJECT_ID} -l {REGION} -b on {OUTPUT_GS_PATH}\n",
         "! gsutil copy $PUBLIC_TRAINING_DATASET $INPUT_GS_PATH"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "34c95126",
       "metadata": {
         "id": "34c95126"
       },
@@ -541,21 +774,18 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "3a54368a",
       "metadata": {
         "id": "3a54368a"
       },
       "outputs": [],
       "source": [
-        "now = datetime.now()\n",
         "INPUT_URI = \"gs://bp_mm_public_data/churn/churn_bp_outsample.jsonl\"\n",
         "OUTPUT_URI = OUTPUT_GS_PATH\n",
         "INSTANCES_FORMAT = \"jsonl\"\n",
         "PREDICTIONS_FORMAT = \"jsonl\"\n",
         "JOB_NAME_PREFIX = \"bp_mm_demo\"\n",
-        "MODEL_NAME = f\"projects/{PROJECT_ID}/locations/{REGION}/models/{MODEL_ID}\"\n",
-        "MACHINE_TYPE = \"n1-standard-8\"\n",
-        "BATCH_PREDICTION_JOB_NAME = JOB_NAME_PREFIX + \"_\" + now.strftime(\"%Y%m%d%H%M%S\")\n",
+        "MODEL_NAME = model.resource_name\n",
+        "BATCH_PREDICTION_JOB_NAME = JOB_NAME_PREFIX + \"_\" + UUID\n",
         "\n",
         "from google.cloud.aiplatform_v1beta1.types import (\n",
         "    BatchDedicatedResources, BatchPredictionJob, GcsDestination, GcsSource,\n",
@@ -573,7 +803,7 @@
         "        gcs_destination=GcsDestination(output_uri_prefix=OUTPUT_URI),\n",
         "    ),\n",
         "    dedicated_resources=BatchDedicatedResources(\n",
-        "        machine_spec=MachineSpec(machine_type=MACHINE_TYPE),\n",
+        "        machine_spec=MachineSpec(machine_type=DEPLOY_COMPUTE),\n",
         "        starting_replica_count=1,\n",
         "        max_replica_count=1,\n",
         "    ),\n",
@@ -604,7 +834,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "cae39778",
       "metadata": {
         "id": "cae39778"
       },
@@ -617,7 +846,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "bcdd4a47",
       "metadata": {
         "id": "bcdd4a47"
       },
@@ -638,7 +866,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "49ec90a0",
       "metadata": {
         "id": "49ec90a0"
       },
@@ -651,7 +878,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "c30496b5",
       "metadata": {
         "id": "c30496b5"
       },
@@ -664,7 +890,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "831651c2",
       "metadata": {
         "id": "831651c2"
       },
@@ -684,7 +909,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "a705c10b",
       "metadata": {
         "id": "a705c10b"
       },
@@ -695,7 +919,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "2bbdddac",
       "metadata": {
         "id": "2bbdddac"
       },
@@ -708,7 +931,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "f6c674e9",
       "metadata": {
         "id": "f6c674e9"
       },
@@ -746,7 +968,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "233b1266",
       "metadata": {
         "id": "233b1266"
       },
@@ -759,7 +980,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "4e8c00a7",
       "metadata": {
         "id": "4e8c00a7"
       },
@@ -774,7 +994,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "497a0016",
       "metadata": {
         "id": "497a0016"
       },
@@ -790,7 +1009,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "eabc3f81",
       "metadata": {
         "id": "eabc3f81"
       },
@@ -806,7 +1024,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "0aa0219d",
       "metadata": {
         "id": "0aa0219d"
       },

notebooks/community/prediction/custom_prediction_routines/SDK_Custom_Predict_SDK_Integration.ipynb

@@ -37,7 +37,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai-samples/main/notebooks/community/prediction/custom_prediction_routines/SDK_Custom_Predict_SDK_Integration.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/prediction/custom_prediction_routines/SDK_Custom_Predict_SDK_Integration.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/community/prediction/custom_prediction_routines/SDK_Custom_Preprocess.ipynb

@@ -673,7 +673,7 @@
         "Before you can deploy your model for serving, Vertex AI needs access to the following files in Cloud Storage:\n",
         "\n",
         "* `model.joblib` (model artifact)\n",
-        "* `preprocessor.pkl` (model artifact)\n",
+        "* `preprocessor.pkl` (preprocessor code)\n",
         "\n",
         "Run the following commands to upload your files:"
       ]

notebooks/community/prediction/custom_prediction_routines/SDK_Pytorch_Custom_Predict.ipynb

@@ -37,7 +37,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai-samples/main/notebooks/community/prediction/custom_prediction_routines/SDK_Pytorch_Custom_Predict.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/prediction/custom_prediction_routines/SDK_Pytorch_Custom_Predict.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/community/prediction/custom_prediction_routines/SDK_Triton_PyTorch_Local_Prediction.ipynb

@@ -37,7 +37,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai-samples/main/notebooks/community/prediction/custom_prediction_routines/SDK_Triton_PyTorch_Local_Prediction.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/community/prediction/custom_prediction_routines/SDK_Triton_PyTorch_Local_Prediction.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/curated.csv

@@ -0,0 +1,32 @@
+tag,notebook
+AutoML,official/automl/automl-text-classification.ipynb
+AutoML,official/automl/sdk_automl_tabular_forecasting_batch.ipynb
+Tabular Data,official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb
+Tabular Data,official/automl/automl_tabular_on_vertex_pipelines.ipynb
+Custom Training,official/custom/sdk-custom-image-classification-batch.ipynb
+Custom Training,official/custom/sdk-custom-image-classification-online.ipynb
+Vertex Explainable AI,official/explainable_ai/sdk_automl_tabular_binary_classification_batch_explain.ipynb
+Vertex Explainable AI,official/explainable_ai/sdk_automl_tabular_classification_online_explain.ipynb
+Vertex Explainable AI,official/explainable_ai/sdk_custom_image_classification_batch_explain.ipynb
+Vertex Explainable AI,official/explainable_ai/sdk_custom_image_classification_online_explain.ipynb
+Vertex Explainable AI,official/explainable_ai/sdk_custom_tabular_regression_batch_explain.ipynb
+Vertex Explainable AI,official/explainable_ai/sdk_custom_tabular_regression_online_explain.ipynb
+Vertex AI Experiments,official/experiments/comparing_pipeline_runs.ipynb
+Vertex AI Experiments,official/experiments/build_model_experimentation_lineage_with_prebuild_code.ipynb
+Vertex AI Experiments,official/experiments/comparing_local_trained_models.ipynb
+Vertex AI Feature Store,official/feature_store/sdk-feature-store.ipynb
+Matching Engine,official/matching_engine/sdk_matching_engine_for_indexing.ipynb
+BigQuery ML and Vertex AI Model Registry,official/model-registry/bqml-vertexai-model-registry.ipynb
+Vertex ML Metadata,official/ml_metadata/sdk-metric-parameter-tracking-for-custom-jobs.ipynb
+Model Monitoring,official/model_monitoring/model_monitoring.ipynb
+Vertex AI Pipelines,official/pipelines/lightweight_functions_component_io_kfp.ipynb
+Vertex AI Pipelines,official/pipelines/google_cloud_pipeline_components_automl_images.ipynb
+Vertex AI Pipelines,official/pipelines/automl_tabular_classification_beans.ipynb
+Vertex AI Pipelines,official/pipelines/google_cloud_pipeline_components_automl_tabular.ipynb
+Vertex AI Pipelines,official/pipelines/google_cloud_pipeline_components_automl_text.ipynb
+Vertex AI Pipelines,official/pipelines/custom_model_training_and_batch_prediction.ipynb
+Vertex AI Pipelines,official/pipelines/google_cloud_pipeline_components_model_train_upload_deploy.ipynb
+Vertex AI Pipelines,official/pipelines/control_flow_kfp.ipynb
+Vertex AI Pipelines,official/pipelines/metrics_viz_run_compare_kfp.ipynb
+Vertex AI Pipelines,official/pipelines/pipelines_intro_kfp.ipynb
+Vertex AI Vizier,official/vizier/gapic-vizier-multi-objective-optimization.ipynb

notebooks/notebook_template.ipynb

@@ -29,6 +29,8 @@
         "id": "JAPoU8Sm5E6e"
       },
       "source": [
+        "# [TODO] Add your H1 title heading here\n",
+        "\n",
         "<table align=\"left\">\n",
         "\n",
         "  <td>\n",
@@ -80,7 +82,7 @@
         "\n",
         "The steps performed include:\n",
         "\n",
-        "- * {TODO: Add high level bullets for the steps of performed in the notebook}"
+        "- *{TODO: Add high level bullets for the steps of performed in the notebook}*"
       ]
     },
     {
@@ -109,21 +111,24 @@
         "This tutorial uses billable components of Google Cloud:\n",
         "\n",
         "* Vertex AI\n",
+        "* {TODO: BigQyuery}\n",
         "* Cloud Storage\n",
         "\n",
-        "{TODO: Include links to pricing documentation for each product you listed above.}\n",
+        "{TODO: Include links to pricing documentation for each product you listed above.\n",
+        " NOTE: If you use BigQuery or Dataflow, you need to add this to the pricing.\n",
+        "}\n",
         "\n",
-        "Learn about [Vertex AI\n",
-        "pricing](https://cloud.google.com/vertex-ai/pricing) and [Cloud Storage\n",
-        "pricing](https://cloud.google.com/storage/pricing), and use the [Pricing\n",
-        "Calculator](https://cloud.google.com/products/calculator/)\n",
+        "Learn about [Vertex AI pricing](https://cloud.google.com/vertex-ai/pricing),\n",
+        "{ TODO: [BigQuery pricing](https://cloud.google.com/bigquery/pricing), }\n",
+        "and [Cloud Storage pricing](https://cloud.google.com/storage/pricing), \n",
+        "and use the [Pricing Calculator](https://cloud.google.com/products/calculator/)\n",
         "to generate a cost estimate based on your projected usage."
       ]
     },
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "ze4-nDLfK4pw"
+        "id": "gCuSR8GkAgzl"
       },
       "source": [
         "### Set up your local development environment\n",
@@ -132,6 +137,17 @@
         "all the requirements to run this notebook. You can skip this step."
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "24743cf4a1e1"
+      },
+      "source": [
+        "**_NOTE_**: This notebook has been tested in the following environment:\n",
+        "\n",
+        "* Python version = 3.9"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -142,10 +158,6 @@
         "You need the following:\n",
         "\n",
         "* The Google Cloud SDK\n",
-        "* Git\n",
-        "* Python 3\n",
-        "* virtualenv\n",
-        "* Jupyter notebook running in a virtual environment with Python 3\n",
         "\n",
         "The Google Cloud guide to [Setting up a Python development\n",
         "environment](https://cloud.google.com/python/setup) and the [Jupyter\n",
@@ -204,7 +216,7 @@
         "    USER_FLAG = \"--user\"\n",
         "\n",
         "! pip3 install --upgrade google-cloud-aiplatform {USER_FLAG} -q\n",
-        "# TODO: Add remaining package installs here"
+        "# TODO: Add remaining package installs here. All packages should be on a single pip install to resolve dependencies"
       ]
     },
     {
@@ -237,21 +249,14 @@
         "    app.kernel.do_shutdown(True)"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "lWEdiXsJg0XY"
-      },
-      "source": [
-        "## Before you begin"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
         "id": "BF1j6f9HApxa"
       },
       "source": [
+        "## Before you begin\n",
+        "\n",
         "### Set up your Google Cloud project\n",
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
@@ -412,21 +417,14 @@
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "dr--iN2kAylZ"
+        "id": "sBCra4QMA2wR"
       },
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
         "**If you are using Vertex AI Workbench Notebooks**, your environment is already\n",
-        "authenticated. Skip this step."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "sBCra4QMA2wR"
-      },
-      "source": [
+        "authenticated. \n",
+        "\n",
         "**If you are using Colab**, run the cell below and follow the instructions\n",
         "when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -481,7 +479,7 @@
         "    # path to your service account key and run this cell to authenticate your GCP\n",
         "    # account.\n",
         "    elif not os.getenv(\"IS_TESTING\"):\n",
-        "        %env GOOGLE_APPLICATION_CREDENTIALS ''"
+        "        %env GOOGLE_APPLICATION_CREDENTIALS '[your-service-account-key-path]'"
       ]
     },
     {
@@ -497,7 +495,7 @@
         "\n",
         "{TODO: Adjust wording in the first paragraph to fit your use case - explain how your tutorial uses the Cloud Storage bucket. The example below shows how Vertex AI uses the bucket for training.}\n",
         "\n",
-        "When you submit a training job using the Cloud SDK, you upload a Python package\n",
+        "When you submit a training job using the Vertex AI SDK, you upload a Python package\n",
         "containing your training code to a Cloud Storage bucket. Vertex AI runs\n",
         "the code from this package. In this tutorial, Vertex AI also saves the\n",
         "trained model that results from your job in the same bucket. Using this model artifact, you can then\n",

notebooks/notebook_template_review.py

@@ -3,24 +3,33 @@ import argparse
 import json
 import os
 import urllib.request
+import csv
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--notebook-dir', dest='notebook_dir',
                     default=None, type=str, help='Notebook directory')
 parser.add_argument('--notebook', dest='notebook',
                     default=None, type=str, help='Notebook to review')
-parser.add_argument('--errors', dest='errors',
-                    default=False, type=bool, help='Report errors')
-parser.add_argument('--errors-csv', dest='errors_csv',
-                    default=False, type=bool, help='Report errors as CSV')
+parser.add_argument('--notebook-file', dest='notebook_file',
+                    default=None, type=str, help='File with list of notebooks to review')
+parser.add_argument('--errors', dest='errors', action='store_true', 
+                    default=False, help='Report errors')
+parser.add_argument('--errors-csv', dest='errors_csv', action='store_true', 
+                    default=False, help='Report errors as CSV')
 parser.add_argument('--errors-codes', dest='errors_codes',
                     default=None, type=str, help='Report only specified errors')
-parser.add_argument('--desc', dest='desc',
-                    default=False, type=bool, help='Output description')
-parser.add_argument('--uses', dest='uses',
-                    default=False, type=bool, help='Output uses (resources)')
-parser.add_argument('--steps', dest='steps',
-                    default=False, type=bool, help='Ouput steps')
+parser.add_argument('--title', dest='title', action='store_true',
+                    default=False, help='Output description')
+parser.add_argument('--desc', dest='desc', action='store_true', 
+                    default=False, help='Output description')
+parser.add_argument('--uses', dest='uses', action='store_true', 
+                    default=False, help='Output uses (resources)')
+parser.add_argument('--steps', dest='steps', action='store_true', 
+                    default=False, help='Ouput steps')
+parser.add_argument('--web', dest='web', action='store_true', 
+                    default=False, help='Output format in HTML')
+parser.add_argument('--repo', dest='repo', action='store_true', 
+                    default=False, help='Output format in Markdown')
 args = parser.parse_args()
 
 if args.errors_codes:
@@ -30,6 +39,20 @@ if args.errors_codes:
 if args.errors_csv:
     args.errors = True
 
+# Copyright cell
+ERROR_COPYRIGHT = 0
+
+# Links cell
+ERROR_TITLE_HEADING = 1
+ERROR_HEADING_CASE = 2
+ERROR_HEADING_CAP = 3
+ERROR_LINK_GIT_MISSING = 4
+ERROR_LINK_COLAB_MISSING = 5
+ERROR_LINK_WORKBENCH_MISSING = 6
+ERROR_LINK_GIT_BAD = 7
+ERROR_LINK_COLAB_BAD = 8
+ERROR_LINK_WORKBENCH_BAD = 9
+
 def parse_dir(directory):
     entries = os.scandir(directory)
     for entry in entries:
@@ -56,8 +79,8 @@ def parse_notebook(path):
         # cell 1 is copyright
         nth = 0
         cell, nth = get_cell(path, cells, nth)
-        if not cell['source'][0].startswith('# Copyright'):
-            report_error(path, 0, "missing copyright cell")
+        if not 'Copyright' in cell['source'][0]:
+            report_error(path, ERROR_COPYRIGHT, "missing copyright cell")
             
         # check for notices
         cell, nth = get_cell(path, cells, nth)
@@ -66,40 +89,50 @@ def parse_notebook(path):
             
         # cell 2 is title and links
         if not cell['source'][0].startswith('# '):
-            report_error(path, 1, "title cell must start with H1 heading")
+            report_error(path, ERROR_TITLE_HEADING, "title cell must start with H1 heading")
+            title = ''
         else:
             title = cell['source'][0][2:].strip()
             check_sentence_case(path, title)
+            
+            # H1 title only
+            if len(cell['source']) == 1:
+                cell, nth = get_cell(path, cells, nth)
            
         # check links.
         source = ''
+        git_link = None
+        colab_link = None
+        workbench_link = None
         for line in cell['source']:
             source += line
             if '<a href="https://github.com' in line:
-                link = line.strip()[9:-2]
+                git_link = line.strip()[9:-2].replace('" target="_blank', '')
                 try:
-                    code = urllib.request.urlopen(link).getcode()
+                    code = urllib.request.urlopen(git_link).getcode()
                 except Exception as e:
-                    report_error(path, 7, f"bad GitHub link: {link}")
+                    report_error(path, ERROR_LINK_GIT_BAD, f"bad GitHub link: {git_link}")
+                    
             if '<a href="https://colab.research.google.com/' in line:
-                link = 'https://github.com/' + line.strip()[50:-2]
+                colab_link = 'https://github.com/' + line.strip()[50:-2].replace('" target="_blank', '')
                 try:
-                    code = urllib.request.urlopen(link).getcode()
+                    code = urllib.request.urlopen(colab_link).getcode()
                 except Exception as e:
-                    report_error(path, 8, f"bad Colab link: {link}")
+                    report_error(path, ERROR_LINK_COLAB_BAD, f"bad Colab link: {colab_link}")
+                    
             if '<a href="https://console.cloud.google.com/vertex-ai/workbench/' in line:
-                link = line.strip()[91:-2]
+                workbench_link = line.strip()[91:-2].replace('" target="_blank', '')
                 try:
-                    code = urllib.request.urlopen(link).getcode()
+                    code = urllib.request.urlopen(workbench_link).getcode()
                 except Exception as e:
-                    report_error(path, 9, f"bad Workbench link: {link}")
+                    report_error(path, ERROR_LINK_WORKBENCH_BAD, f"bad Workbench link: {workbench_link}")
 
-        if 'View on GitHub' not in source:
-            report_error(path, 4, 'Missing link for GitHub')
-        if 'Open in Vertex AI Workbench' not in source:
-            report_error(path, 5, 'Missing link for Workbench')
-        if 'master' in source:
-            report_error(path, 6, 'Outdated branch (master) used in link')
+        if 'View on GitHub' not in source or not git_link:
+            report_error(path, ERROR_LINK_GIT_MISSING, 'Missing link for GitHub')
+        if 'Run in Colab' not in source or not colab_link:
+            report_error(path, ERROR_LINK_COLAB_MISSING, 'Missing link for Colab')    
+        if 'Open in Vertex AI Workbench' not in source or not workbench_link:
+            report_error(path, ERROR_LINK_WORKBENCH_MISSING, 'Missing link for Workbench')
             
         # Overview
         cell, nth = get_cell(path, cells, nth)
@@ -113,7 +146,7 @@ def parse_notebook(path):
             costs = []
         else:
             desc, uses, steps, costs = parse_objective(path, cell)
-            add_index(path, title, desc, uses, steps)
+            add_index(path, tag, title, desc, uses, steps, git_link, colab_link, workbench_link)
             
         # (optional) Recommendation
         cell, nth = get_cell(path, cells, nth)
@@ -287,7 +320,10 @@ def check_text_cell(path, cell):
         'Vertex Private Endpoint': 'Vertex AI Private Endpoint',
         'Tensorflow': 'TensorFlow',
         'Tensorboard': 'TensorBoard',
-        'Google Cloud Notebooks': 'Vertex AI Workbench Notebooks'
+        'Google Cloud Notebooks': 'Vertex AI Workbench Notebooks',
+        'Bigquery': 'BigQuery',
+        'Pytorch': 'PyTorch',
+        'Sklearn': 'scikit-learn'
     }
     
     for line in cell['source']:
@@ -306,15 +342,15 @@ def check_text_cell(path, cell):
 def check_sentence_case(path, heading):
     words = heading.split(' ')
     if not words[0][0].isupper():
-        report_error(path, 2, f"heading must start with capitalized word: {words[0]}")
+        report_error(path, ERROR_HEADING_CAP, f"heading must start with capitalized word: {words[0]}")
         
     for word in words[1:]:
         word = word.replace(':', '').replace('(', '').replace(')', '')
         if word in ['E2E', 'Vertex', 'AutoML', 'ML', 'AI', 'GCP', 'API', 'R', 'CMEK', 'TFX', 'TFDV', 'SDK',
-                    'VM', 'CPR', 'NVIDIA', 'ID', 'DASK']:
+                    'VM', 'CPR', 'NVIDIA', 'ID', 'DASK', 'ARIMA_PLUS', 'KFP', 'I/O']:
             continue
         if word.isupper():
-            report_error(path, 3, f"heading is not sentence case: {word}")
+            report_error(path, ERROR_HEADING_CASE, f"heading is not sentence case: {word}")
 
 
 def report_error(notebook, code, msg):
@@ -388,35 +424,74 @@ def parse_objective(path, cell):
             
     return desc, uses, steps, costs
 
-def add_index(path, title, desc, uses, steps):
-    if not args.desc and not args.uses and not args.steps:
-        return
-    
+def add_index(path, tag, title, desc, uses, steps, git_link, colab_link, workbench_link):
     title = title.split(':')[-1].strip()
     title = title[0].upper() + title[1:]
+    if args.web:
+        print('    <tr>')
+        print('        <td>')
+        print(f'            {tag}\n')
+        print('        </td>')
+        print('        <td>')
+        print(f'            {title}\n')
+        print('        </td>')
+        print('        <td>')
+        if colab_link:
+            print(f'            <a src="{colab_link}">Colab</a>')
+        if git_link:
+            print(f'            <a src="{git_link}">GitHub</a>')
+        if workbench_link:
+            print(f'            <a src="{workbench_link}">Vertex AI Workbench</a>')
+        print('        </td>')
+        print('    </tr>\n')
+    elif args.repo:
+        print(f"\n[{title}]({path})\n")
     
-    print(f"\n[{title}]({path})\n")
-    
-    if args.desc:
-        print(desc)
-        
-    if args.uses:
-        print(uses)
-        
-    if args.steps:
-        print(steps)
+        if args.desc:
+            print(desc)
+
+        if args.uses:
+            print(uses)
+
+        if args.steps:
+            print(steps)
+
+if args.web:
+    print('<table>')
+    print('    <th>Vertex AI Feature</th>')
+    print('    <th>Description</th>')
+    print('    <th>Open in</th>')
 
 
 if args.notebook_dir:
     if not os.path.isdir(args.notebook_dir):
         print("Error: not a directory:", args.notebook_dir)
         exit(1)
+    tag = ''
     parse_dir(args.notebook_dir)
 elif args.notebook:
     if not os.path.isfile(args.notebook):
         print("Error: not a notebook:", args.notebook)
         exit(1)
+    tag = ''
     parse_notebook(args.notebook)
+elif args.notebook_file:
+    if not os.path.isfile(args.notebook_file):
+        print("Error: file does not exist", args.notebook_file)
+    else:
+        with open(args.notebook_file, 'r') as csvfile:
+            reader = csv.reader(csvfile)
+            heading = True
+            for row in reader:
+                if heading:
+                    heading = False
+                else:
+                    tag = row[0]
+                    notebook = row[1]
+                    parse_notebook(notebook)
 else:
-        print("Error: must specify a directory or notebook")
-        exit(1)
+    print("Error: must specify a directory or notebook")
+    exit(1)
+
+if args.web:
+    print('</table>\n')

notebooks/official/CODEOWNERS

@@ -10,12 +10,13 @@
 /tabnet/tabnet_vertex_tutorial.ipynb @longtle
 
 /migration @andrewferlitsch
-/explainabl_ai   
+/explainabl_ai
 /pipelines @andrewferlitsch
 /ml_metadata @andrewferlitsch
 /model_monitoring @andrewferlitsch
 /tensorboard @zbl94
 
+/bigquery_ml/bqml-online-prediction.ipynb @polong-lin
 /model_monitoring/model_monitoring.ipynb @mco-gh
 /ml_metadata/sdk-metric-parameter-tracking-for-custom-jobs.ipynb @jialuzh
 /ml_metadata/sdk-metric-parameter-tracking-for-locally-trained-models.ipynb @jialuzh
@@ -28,4 +29,11 @@
 /automl/automl_forecasting_bqml_arima_plus_comparison.ipynb @TheMichaelHu
 /automl/automl_tabular_on_vertex_pipelines.ipynb @helinwang
 /custom/custom_training_tensorboard_profiler.ipynb @itseric
-/workbench/spark/spark_sample_notebook.ipynb @bmiro
+/workbench/spark/spark_sample_notebook.ipynb @bradmiro
+/workbench/spark/spark_ml.ipynb @bradmiro
+/model-registry/bqml-vertexai-model-registry.ipynb @soheilazangeneh
+/workbench/exploratory_data_analysis/explore_data_in_bigquery_with_workbench.ipynb @alokpattani
+/model_evaluation/automl_tabular_classification_model_evaluation.ipynb @soheilazangeneh
+/model_evaluation/automl_tabular_regression_model_evaluation.ipynb @soheilazangeneh
+/tabular_workflows/tabnet_on_vertex_pipelines.ipynb @sakagarwal
+/tabular_workflows/wide_and_deep_on_vertex_pipelines.ipynb @sakagarwal

notebooks/official/automl/automl-text-classification.ipynb

@@ -2,7 +2,7 @@
   "cells": [
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 54,
       "metadata": {
         "id": "ur8xi4C7S06n"
       },
@@ -17,12 +17,21 @@
         "#     https://www.apache.org/licenses/LICENSE-2.0\n",
         "#\n",
         "# Unless required by applicable law or agreed to in writing, software\n",
-        "# distributed under the License is distributed on an \"AS IS\" BASIS,\n",
+        "# distributed under the Lice`nse is distributed on an \"AS IS\" BASIS,\n",
         "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n",
         "# See the License for the specific language governing permissions and\n",
         "# limitations under the License."
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "0d2298941703"
+      },
+      "source": [
+        "# Vertex AI: Create, train, and deploy an AutoML text classification model"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -43,8 +52,8 @@
         "    </a>\n",
         "  </td>\n",
         " <td>\n",
-        "    <a href=\"https://console.cloud.google.com/ai/platform/notebooks/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/automl/automl-text-classification.ipynb\">\n",
-        "        <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/automl/automl-text-classification.ipynb\">\n",
+        "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
         "  </td>\n",
@@ -54,19 +63,20 @@
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "0259a7ce8120"
+        "id": "1adb10a59bc3"
       },
       "source": [
-        "# Vertex AI: Create, train, and deploy an AutoML text classification model\n",
-        "\n",
         "## Overview\n",
         "\n",
-        "This notebook walks you through the major phases of building and using an AutoML text classification model on [Vertex AI](https://cloud.google.com/vertex-ai/docs/). \n",
-        "\n",
-        "### Dataset\n",
-        "\n",
-        "In this notebook, you use the \"Happy Moments\" sample dataset to train a model. The resulting model classifies happy moments into categores that reflect the causes of happiness. \n",
-        "\n",
+        "This notebook walks you through the major phases of building and using an AutoML text classification model on [Vertex AI](https://cloud.google.com/vertex-ai/docs/). \n"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "9b9824ae2c91"
+      },
+      "source": [
         "### Objective\n",
         "\n",
         "In this tutorial, you learn how to use `AutoML` to train a text classification model.\n",
@@ -84,8 +94,26 @@
         "* Create an `Endpoint` resource.\n",
         "* Deploy the `Model` resource to the `Endpoint` resource.\n",
         "* Make an online prediction\n",
-        "* Make a batch prediction\n",
+        "* Make a batch prediction"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "f67c62885df4"
+      },
+      "source": [
+        "### Dataset\n",
         "\n",
+        "In this notebook, you use the \"Happy Moments\" sample dataset to train a model. The resulting model classifies happy moments into categores that reflect the causes of happiness. "
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "0259a7ce8120"
+      },
+      "source": [
         "### Costs\n",
         "\n",
         "This tutorial uses billable components of Google Cloud:\n",
@@ -173,7 +201,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 55,
       "metadata": {
         "id": "b75757581291"
       },
@@ -188,6 +216,7 @@
         ")\n",
         "\n",
         "# Vertex AI Notebook requires dependencies to be installed with '--user'\n",
+        "\n",
         "USER_FLAG = \"\"\n",
         "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
@@ -208,7 +237,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 56,
       "metadata": {
         "id": "0c0b2427998a"
       },
@@ -254,7 +283,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 1,
       "metadata": {
         "id": "be175254a715"
       },
@@ -311,7 +340,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 4,
       "metadata": {
         "id": "ae43d96c4b1b"
       },
@@ -336,7 +365,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 5,
       "metadata": {
         "id": "953fa6e5ddda"
       },
@@ -424,7 +453,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 6,
       "metadata": {
         "id": "d2de92accb67"
       },
@@ -436,7 +465,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 7,
       "metadata": {
         "id": "5ba09496accc"
       },
@@ -478,7 +507,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 9,
       "metadata": {
         "id": "96ad3d416327"
       },
@@ -498,7 +527,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 10,
       "metadata": {
         "id": "152013538e59"
       },
@@ -521,7 +550,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 11,
       "metadata": {
         "id": "740cd5c67c79"
       },
@@ -551,24 +580,15 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "6caf82e5e84e"
+        "id": "d35b8b6b94ae"
       },
       "outputs": [],
       "source": [
         "# Use a timestamp to ensure unique resources\n",
         "src_uris = \"gs://cloud-ml-data/NL-classification/happiness.csv\"\n",
-        "display_name = f\"e2e-text-dataset-{TIMESTAMP}\""
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "d35b8b6b94ae"
-      },
-      "outputs": [],
-      "source": [
-        "ds = aiplatform.TextDataset.create(\n",
+        "display_name = f\"e2e-text-dataset-{TIMESTAMP}\"\n",
+        "\n",
+        "text_dataset = aiplatform.TextDataset.create(\n",
         "    display_name=display_name,\n",
         "    gcs_source=src_uris,\n",
         "    import_schema_uri=aiplatform.schema.dataset.ioformat.text.single_label_classification,\n",
@@ -582,53 +602,7 @@
         "id": "5b3cc427353a"
       },
       "source": [
-        "## Train your text classification model\n",
-        "\n",
-        "Once your dataset has finished importing data, you are ready to train your model. To do this, you first need the full resource name of your dataset, where the full name has the format `projects/[YOUR_PROJECT]/locations/[YOUR_REGIO)N]/datasets/[YOUR_DATASET_ID]`. If you don't have the resource name handy, you can list all of the datasets in your project using `TextDataset.list()`. \n",
-        "\n",
-        "As shown in the following code block, you can pass in the display name of your dataset in the call to `list()` to filter the results.\n"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "52cf56f1c8a9"
-      },
-      "outputs": [],
-      "source": [
-        "datasets = aiplatform.TextDataset.list(filter=f'display_name=\"{display_name}\"')\n",
-        "print(datasets)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "58df3e02df82"
-      },
-      "source": [
-        "When you create a new model, you need a reference to the `TextDataset` object that corresponds to your dataset. You can use the `ds` variable you created previously when you created the dataset or you can also list all of your datasets to get a reference to your dataset. Each item returned from `TextDataset.list()` is an instance of `TextDataset`.\n",
-        "\n",
-        "The following code block shows how to instantiate a `TextDataset` object using a dataset ID. Note that this code is intentionally verbose for demonstration purposes."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "aa667203da03"
-      },
-      "outputs": [],
-      "source": [
-        "# Get the dataset ID if it's not available\n",
-        "dataset_id = \"[your-dataset-id]\"\n",
-        "\n",
-        "if dataset_id == \"[your-dataset-id]\":\n",
-        "    # Use the reference to the new dataset captured when we created it\n",
-        "    dataset_id = ds.resource_name.split(\"/\")[-1]\n",
-        "    print(f\"Dataset ID: {dataset_id}\")\n",
-        "\n",
-        "text_dataset = aiplatform.TextDataset(dataset_id)"
+        "## Train your text classification model\n"
       ]
     },
     {
@@ -653,7 +627,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 16,
       "metadata": {
         "id": "0aa0f01805ea"
       },
@@ -682,8 +656,8 @@
         "model = job.run(\n",
         "    dataset=text_dataset,\n",
         "    model_display_name=model_display_name,\n",
-        "    training_fraction_split=0.7,\n",
-        "    validation_fraction_split=0.2,\n",
+        "    training_fraction_split=0.1,\n",
+        "    validation_fraction_split=0.1,\n",
         "    test_fraction_split=0.1,\n",
         "    sync=True,\n",
         ")"
@@ -744,35 +718,6 @@
         ")"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "531da446035b"
-      },
-      "source": [
-        "In case you didn't record the name of the new endpoint, you can get a list of all your endpoints as you did before with datasets and models. For each endpoint, you can list the models deployed to that endpoint. To get a reference to the model that you just deployed, you can check the `display_name` of each model deployed to the endpoint against the model you're looking for."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "f61fb44181b4"
-      },
-      "outputs": [],
-      "source": [
-        "endpoints = aiplatform.Endpoint.list()\n",
-        "\n",
-        "endpoint_with_deployed_model = []\n",
-        "\n",
-        "for endpoint_ in endpoints:\n",
-        "    for model in endpoint_.list_models():\n",
-        "        if model.display_name.find(deployed_model_display_name) == 0:\n",
-        "            endpoint_with_deployed_model.append(endpoint_)\n",
-        "\n",
-        "print(endpoint_with_deployed_model)"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -781,7 +726,7 @@
       "source": [
         "## Get online predictions from your model\n",
         "\n",
-        "Now that you have your endpoint's resource name, you can get online predictions from the text classification model. To get the online prediction, you send a prediction request to your endpoint."
+        "Now that you have your endpoint, you can get online predictions from the text classification model. To get the online prediction, you send a prediction request to your endpoint."
       ]
     },
     {
@@ -792,13 +737,6 @@
       },
       "outputs": [],
       "source": [
-        "endpoint_name = \"[your-endpoint-name]\"\n",
-        "if endpoint_name == \"[your-endpoint-name]\":\n",
-        "    endpoint_name = endpoint.resource_name\n",
-        "\n",
-        "print(f\"Endpoint name: {endpoint_name}\")\n",
-        "\n",
-        "endpoint = aiplatform.Endpoint(endpoint_name)\n",
         "content = \"I got a high score on my math final!\"\n",
         "\n",
         "response = endpoint.predict(instances=[{\"content\": content}])\n",
@@ -835,7 +773,7 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 23,
       "metadata": {
         "id": "e4b838cbcd99"
       },
@@ -858,7 +796,7 @@
         "\n",
         "+ All of your prediction instances as individual files on Google Cloud Storage, as TXT files for your instances\n",
         "+ A JSONL file that lists the URIs of all your prediction instances\n",
-        "+ A Google Cloud Storage bucket to hold the output from batch prediction\n",
+        "+ A Cloud Storage bucket to hold the output from batch prediction\n",
         "\n",
         "For this tutorial, the following cells create a new Storage bucket, upload individual prediction instances as text files to the bucket, and then create the JSONL file with the URIs of your prediction instances."
       ]
@@ -872,16 +810,15 @@
       "outputs": [],
       "source": [
         "# Instantiate the Storage client and create the new bucket\n",
-        "storage = storage.Client()\n",
-        "bucket = storage.bucket(BUCKET_URI)\n",
-        "\n",
+        "# from google.cloud import  storage\n",
+        "storage_client = storage.Client()\n",
+        "bucket = storage_client.bucket(BUCKET_NAME)\n",
         "# Iterate over the prediction instances, creating a new TXT file\n",
         "# for each.\n",
         "input_file_data = []\n",
         "for count, instance in enumerate(instances):\n",
         "    instance_name = f\"input_{count}.txt\"\n",
         "    instance_file_uri = f\"{BUCKET_URI}/{instance_name}\"\n",
-        "\n",
         "    # Add the data to store in the JSONL input file.\n",
         "    tmp_data = {\"content\": instance_file_uri, \"mimeType\": \"text/plain\"}\n",
         "    input_file_data.append(tmp_data)\n",
@@ -901,7 +838,7 @@
         "id": "31c262320610"
       },
       "source": [
-        "Now that you have the bucket with the prediction instances ready, you can send a batch prediction request to Vertex AI. When you send a request to the service, you must provide the URI of your JSONL file and your output bucket, including the `gs://` protocols.\n",
+        "Now that you have the bucket with the prediction instances ready, you can send a batch prediction rhttps://storage.googleapis.com/upload/storage/v1/b/gs://vertex-ai-devaip-20220728004429/o?uploadType=multipartequest to Vertex AI. When you send a request to the service, you must provide the URI of your JSONL file and your output bucket, including the `gs://` protocols.\n",
         "\n",
         "With the Python SDK, you can create a batch prediction job by calling `Model.batch_predict()`."
       ]
@@ -915,15 +852,13 @@
       "outputs": [],
       "source": [
         "job_display_name = \"e2e-text-classification-batch-prediction-job\"\n",
-        "model = aiplatform.Model(model_name=model_name)\n",
-        "\n",
+        "# model = aiplatform.Model(model_name=model.name)\n",
         "batch_prediction_job = model.batch_predict(\n",
         "    job_display_name=job_display_name,\n",
         "    gcs_source=f\"{BUCKET_URI}/{input_file_name}\",\n",
         "    gcs_destination_prefix=f\"{BUCKET_URI}/output\",\n",
         "    sync=True,\n",
         ")\n",
-        "\n",
         "batch_prediction_job_name = batch_prediction_job.resource_name"
       ]
     },
@@ -938,6 +873,15 @@
         "The following code snippet demonstrates how to create an instance of the `BatchPredictionJob` class to review its status. Note that you need the full resource name printed out from the Python SDK for this snippet.\n"
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "cd014de40e2f"
+      },
+      "source": [
+        "## BatchPredictionJob"
+      ]
+    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -999,6 +943,8 @@
       },
       "outputs": [],
       "source": [
+        "import os\n",
+        "\n",
         "RESULTS_DIRECTORY = \"prediction_results\"\n",
         "RESULTS_DIRECTORY_FULL = f\"{RESULTS_DIRECTORY}/output\"\n",
         "\n",
@@ -1020,6 +966,15 @@
         "print(f\"Local results folder: {latest_directory}\")"
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "e375109b7e40"
+      },
+      "source": [
+        "## JsonLines"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -1094,9 +1049,9 @@
         "    ! gsutil rm -r $BUCKET_URI\n",
         "\n",
         "batch_job.delete()\n",
-        "\n",
+        "endpoint.undeploy_all()\n",
         "# `force` parameter ensures that models are undeployed before deletion\n",
-        "endpoint.delete(force=True)\n",
+        "endpoint.delete()\n",
         "\n",
         "model.delete()\n",
         "\n",

notebooks/official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb

@@ -29,16 +29,16 @@
         "id": "title"
       },
       "source": [
-        "# Compare Vertex Forecasting and BQML ARIMA_PLUS\n",
+        "# Compare Vertex AI Forecasting and BigQuery ML ARIMA_PLUS\n",
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
@@ -61,18 +61,7 @@
       "source": [
         "## Overview\n",
         "\n",
-        "In this tutorial, you will take on the role of a store planner who must determine how much inventory they will need to order for each of their products and stores for November 2019. You will accomplish this by training forecasting models using historical sales data. You will start with a baseline model using [BQML ARIMA_PLUS](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-create-time-series) and then compare it against a [Vertex Forecasting](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/overview) model."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "dataset:covid,forecast"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "To demonstrate the tradeoffs between using BQML and Vertex Forecasting, this tutorial will use a synthetic dataset where product sales are dependent on a variety of factors such as advertisements, holidays, and locations. You will see how well a univariate model like ARIMA_PLUS can forecast future sales without knowing information about these factors explicitly, and how well a multivariate model like Vertex Forecasting can perform when these factors are known."
+        "In this tutorial, you take on the role of a store planner who must determine how much inventory they will need to order for each of their products and stores for November 2019. You will accomplish this by training forecasting models using historical sales data. You will start with a baseline model using BigQuery ML (BQML) [ARIMA_PLUS](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-create-time-series) and then compare it against a [Vertex AI Forecasting](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/overview) model."
       ]
     },
     {
@@ -83,19 +72,30 @@
       "source": [
         "### Objective\n",
         "\n",
-        "In this tutorial, you create an BQML ARIMA_PLUS model using a training [Vertex Pipeline](https://cloud.google.com/vertex-ai/docs/pipelines/introduction) from [Google Cloud Pipeline Components](https://cloud.google.com/vertex-ai/docs/pipelines/components-introduction) (GCPC), and then do a batch prediction using the corresponding prediction pipeline. You then train a Vertex Forecasting model using the same data and compare the evaluation metrics.\n",
+        "In this tutorial, you create an BQML ARIMA_PLUS model using a training [Vertex AI Pipeline](https://cloud.google.com/vertex-ai/docs/pipelines/introduction) from [Google Cloud Pipeline Components](https://cloud.google.com/vertex-ai/docs/pipelines/components-introduction) (GCPC), and then do a batch prediction using the corresponding prediction pipeline. You then train a Vertex AI Forecasting model using the same data and compare the evaluation metrics.\n",
         "\n",
         "The steps performed are:\n",
         "\n",
         "- Train the BQML ARIMA_PLUS model.\n",
         "- View BQML model evaluation.\n",
         "- Make a batch prediction with the BQML model.\n",
-        "- Create a Vertex `Dataset` resource.\n",
-        "- Train the Vertex Forecasting model.\n",
+        "- Create a Vertex AI `Dataset` resource.\n",
+        "- Train the Vertex AI Forecasting model.\n",
         "- View the Model evaluation.\n",
         "- Make a batch prediction with the Model.\n"
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "dataset:covid,forecast"
+      },
+      "source": [
+        "### Dataset\n",
+        "\n",
+        "To demonstrate the tradeoffs between using BQML and Vertex AI Forecasting, this tutorial will use a synthetic dataset where product sales are dependent on a variety of factors such as advertisements, holidays, and locations. You will see how well a univariate model like ARIMA_PLUS can forecast future sales without knowing information about these factors explicitly, and how well a multivariate model like Vertex AI Forecasting can perform when these factors are known."
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -155,9 +155,9 @@
         "id": "install_aip:mbsdk"
       },
       "source": [
-        "## Install additional packages\n",
+        "## Installation\n",
         "\n",
-        "Install the latest version of the Google Cloud Pipeline Components (GCPC) SDK."
+        "Install the following packages required to execute this notebook."
       ]
     },
     {
@@ -170,13 +170,22 @@
       "source": [
         "import os\n",
         "\n",
-        "# Google Cloud Notebook\n",
-        "if os.path.exists(\"/opt/deeplearning/metadata/env_version\"):\n",
+        "# The Vertex AI Workbench Notebook product has specific requirements\n",
+        "IS_WORKBENCH_NOTEBOOK = os.getenv(\"DL_ANACONDA_HOME\")\n",
+        "IS_USER_MANAGED_WORKBENCH_NOTEBOOK = os.path.exists(\n",
+        "    \"/opt/deeplearning/metadata/env_version\"\n",
+        ")\n",
+        "\n",
+        "# Vertex AI Notebook requires dependencies to be installed with '--user'\n",
+        "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
         "else:\n",
         "    USER_FLAG = \"\"\n",
         "\n",
-        "! pip3 install --upgrade google-cloud-bigquery[pandas] google-cloud-aiplatform google-cloud-pipeline-components $USER_FLAG"
+        "! (pip3 install --upgrade $USER_FLAG \\\n",
+        "    google-cloud-bigquery[pandas]==2.34.4 \\\n",
+        "    google-cloud-aiplatform==1.16.1 \\\n",
+        "    google-cloud-pipeline-components==1.0.23)"
       ]
     },
     {
@@ -237,7 +246,7 @@
         "5. Enter your project ID in the cell below. Then run the  cell to make sure the\n",
         "Cloud SDK uses the right project for all the commands in this notebook.\n",
         "\n",
-        "6. (optional) You may also specify a service account to use to run Vertex Pipelines in the project.\n",
+        "6. (optional) You may also specify a service account to use to run Vertex AI Pipelines in the project.\n",
         "\n",
         "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$`."
       ]
@@ -301,7 +310,7 @@
         "#### Region\n",
         "All BigQuery operations (`DATA_REGION`) are set to run in the `US` multi-region. This is required by the ARIMA pipeline because the data you will be using is stored in this region. All destination tables will also be stored in this region.\n",
         "\n",
-        "You may change the `REGION` variable, which is used for Vertex Forecasting operations\n",
+        "You may change the `REGION` variable, which is used for Vertex AI Forecasting operations\n",
         "throughout the rest of this notebook.  Below are regions supported for Vertex AI. We recommend that you choose the region closest to you.\n",
         "\n",
         "- Americas: `us-central1`\n",
@@ -321,8 +330,11 @@
       },
       "outputs": [],
       "source": [
+        "REGION = \"[your-region]\"  # @param {type: \"string\"}\n",
         "DATA_REGION = \"US\"  # @param {type: \"string\"}\n",
-        "REGION = \"[your-region]\"  # @param {type: \"string\"}"
+        "\n",
+        "if REGION == \"[your-region]\":\n",
+        "    REGION = \"us-central1\""
       ]
     },
     {
@@ -331,9 +343,9 @@
         "id": "timestamp"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -344,9 +356,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -357,7 +376,7 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Google Cloud Notebooks**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Vertex AI Workbench Notebooks**, your environment is already authenticated.\n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -392,8 +411,11 @@
         "import os\n",
         "import sys\n",
         "\n",
-        "# If on Google Cloud Notebook, then don't execute this code\n",
-        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\"):\n",
+        "# If on Vertex AI Workbench, then don't execute this code\n",
+        "IS_COLAB = \"google.colab\" in sys.modules\n",
+        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
+        "    \"DL_ANACONDA_HOME\"\n",
+        "):\n",
         "    if \"google.colab\" in sys.modules:\n",
         "        from google.colab import auth as google_auth\n",
         "\n",
@@ -401,10 +423,9 @@
         "\n",
         "    # If you are running this notebook locally, replace the string below with the\n",
         "    # path to your service account key and run this cell to authenticate your GCP\n",
-        "    # account. Alternatively, you may edit this notebook to authenticate using\n",
-        "    # gcloud.\n",
+        "    # account.\n",
         "    elif not os.getenv(\"IS_TESTING\"):\n",
-        "        %env GOOGLE_APPLICATION_CREDENTIALS ''"
+        "        %env GOOGLE_APPLICATION_CREDENTIALS '[your-service-account-key-path]'"
       ]
     },
     {
@@ -417,7 +438,7 @@
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "When you initialize the Vertex SDK for Python, you specify a Cloud Storage staging bucket. The staging bucket is where all the data associated with your dataset and model resources are retained across sessions.\n",
+        "When you initialize the Vertex AI SDK for Python, you specify a Cloud Storage staging bucket. The staging bucket is where all the data associated with your dataset and model resources are retained across sessions.\n",
         "\n",
         "Set the name of your Cloud Storage bucket below. Bucket names must be globally unique across all Google Cloud projects, including those outside of your organization."
       ]
@@ -451,9 +472,9 @@
       "outputs": [],
       "source": [
         "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
-        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP\n",
+        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + UUID\n",
         "\n",
-        "! gsutil ls -b $BUCKET_URI || gsutil mb -l $DATA_REGION $BUCKET_URI"
+        "! gsutil ls -b $BUCKET_URI || gsutil mb -l $REGION $BUCKET_URI"
       ]
     },
     {
@@ -511,9 +532,9 @@
         "id": "init_aip:mbsdk"
       },
       "source": [
-        "## Initialize Vertex SDK for Python\n",
+        "## Initialize Vertex AI SDK for Python\n",
         "\n",
-        "Initialize the Vertex SDK for Python for your project and corresponding bucket."
+        "Initialize the Vertex AI SDK for Python for your project and corresponding bucket."
       ]
     },
     {
@@ -555,8 +576,8 @@
       },
       "outputs": [],
       "source": [
-        "arima_dataset_name = f\"forecasting_demo_arima_{TIMESTAMP}\"\n",
-        "vertex_dataset_name = f\"forecasting_demo_vertex_{TIMESTAMP}\"\n",
+        "arima_dataset_name = f\"forecasting_demo_arima_{UUID}\"\n",
+        "vertex_dataset_name = f\"forecasting_demo_vertex_{UUID}\"\n",
         "\n",
         "arima_dataset_path = \".\".join([PROJECT_ID, arima_dataset_name])\n",
         "vertex_dataset_path = \".\".join([PROJECT_ID, vertex_dataset_name])\n",
@@ -789,15 +810,15 @@
         "\n",
         "Now you are ready to start creating your own BQML ARIMA_PLUS model.\n",
         "\n",
-        "Like with Vertex Forecasting, the pipeline you will run will train evaluation models using the training and validation sets and use backtesting to create evaluation metrics on the test set. Finally, a serving model will be produced that uses all available data.\n",
+        "Like with Vertex AI Forecasting, the pipeline you will run will train evaluation models using the training and validation sets and use backtesting to create evaluation metrics on the test set. Finally, a serving model will be produced that uses all available data.\n",
         "\n",
         "**How do you estimate the cost?**\n",
         "\n",
-        "Backtesting will involve training a single BQML model for each period in the test set, so the cost will be a function of the length of the test set. The cost is also multiplied by the number of candidate models trained, which is determined by `max_order`.\n",
+        "Backtesting involves training a single BQML model for each period in the test set, so the cost is a function of the length of the test set after any downsampling done by the windowing strategy. The cost is also multiplied by the number of candidate models trained, which is determined by `max_order`.\n",
         "\n",
-        "According to [BQ pricing](https://cloud.google.com/bigquery-ml/pricing), BQML model creation costs $250 per TB. We'll use a max order of 3, which translates to 20 candidate models when there are multiple time series. Our demo dataset is 3 MB in size, and includes 31 test periods.\n",
+        "According to [BQ pricing](https://cloud.google.com/bigquery-ml/pricing), BQML model creation costs $250 per TB. We'll use a max order of 3, which translates to 20 candidate models when there are multiple time series. Our demo dataset is 3 MB in size, and includes 31 test periods. We window with a stride length of 1, so all periods are used for evaluation.\n",
         "\n",
-        "In this tutorial, the model create stage of the pipeline costs `3 MB * ($250 / 1024^2) * 31 periods * 20 candidates = $0.44`."
+        "In this tutorial, the model create stage of the pipeline costs `3 MB * ($250 / 1024^2) * (31 / 1) periods * 20 candidates = $0.44`."
       ]
     },
     {
@@ -818,47 +839,23 @@
         "\n",
         "- `bigquery_destination_uri`: (optional) BigQuery Dataset URI. Used to export the metrics table and model. If not given, we will create one for the user.\n",
         "- `data_granularity_unit`: Enum used to specify the time granularity (hour, day, week, month, etc).\n",
-        "- `data_source`: JSON for specifying the input data source URI and type. Similar to a Vertex Dataset. Currently supports BigQuery and CSV (in GCS) data sources.\n",
-        "\n",
-        "  It can look like either:\n",
-        "  ```json\n",
-        "  {\n",
-        "    \"big_query_data_source\": {\n",
-        "      \"big_query_table_path\": \"bq://[PROJECT].[DATASET].[TABLE]\"\n",
-        "    }\n",
-        "  }\n",
-        "  ```\n",
-        "  or\n",
-        "  ```json\n",
-        "  {\n",
-        "    \"csv_data_source\": {\n",
-        "      \"csv_filenames\": [ [GCS_PATHS] ],\n",
-        "  }\n",
-        "  ```\n",
+        "- `data_source_csv_filenames` or `data_source_bigquery_table_path`: A URI for either a CSV stored in GCR or a BigQuery table, respectively.\n",
         "- `evaluated_examples_destination_uri\t`: (optional) BigQuery Dataset URI OR Table URI. Used to export the evaluated examples table. Will use bigquery_destination_uri if not provided.\n",
         "- `forecast_horizon`: Integer number of periods to predict.\n",
-        "- `split_spec`: JSON for specifying how data should be split. Supports predefined split and fractional split.\n",
-        "  \n",
-        "  It can look like either:\n",
-        "  ```json\n",
-        "  {\"predefined_split\": {\"key\": \"[SPLIT_COLUMN]\"}}\n",
-        "  ```\n",
-        "  or\n",
-        "  ```json\n",
-        "  {\n",
-        "    \"fraction_split\": {\n",
-        "        \"training_fraction\": 0.8,\n",
-        "        \"validation_fraction\": 0.1,\n",
-        "        \"test_fraction\": 0.1,\n",
-        "    },\n",
-        "  }\n",
-        "  ```\n",
-        "- `target_column_name`: Name of target column.\n",
+        "- A data splitting strategy of either:\n",
+        "  - `predefined_split_key`: A column containing `TRAIN`, `VALIDATE`, or `TEST` to denote the splits for each row.\n",
+        "  -  `training_fraction`, `validation_fraction`, and `test_fraction` to set the fractions to split on chronologically on the time column.\n",
+        "  - `timestamp_split_key` plus the fractions in the previous option to perform fractional splitting on a column other than the time column.\n",
+        "- A windowing strategy of either:\n",
+        "  - `window_column`: A boolean column decides whether or now each row gets considered when calculating the evaluation metrics.\n",
+        "  - `window_stride_length`: Every N rows will be used to compute the evaluation metrics.\n",
+        "  - `window_max_count`: Downsample rows such that only the given number are used to calculate the evaluation metrics.\n",
+        "- `target_column`: Name of target column.\n",
         "- `time_column`: Name of time column.\n",
         "- `time_series_identifier_column`: Name of id column.\n",
         "- `max_order`: Integer between 1 and 5 representing the size of the parameter search space for ARIMA_PLUS. 5 would result in the highest accuracy model, but also the longest training runtime/cost.\n",
         "\n",
-        "The execution of the training pipeline will take around **20 minutes**."
+        "The execution of the training pipeline may take around **20 minutes**."
       ]
     },
     {
@@ -875,31 +872,24 @@
         "forecast_horizon = 30  # @param {type: \"integer\"}\n",
         "data_granularity_unit = \"day\"  # @param {type: \"string\"}\n",
         "split_column = \"split\"  # @param {type: \"string\"}\n",
+        "window_stride_length = 1  # @param {type: \"integer\"}\n",
         "max_order = 3  # @param {type: \"integer\"}\n",
         "override_destination = True  # @param {type: \"boolean\"}\n",
         "\n",
-        "split_spec = {\"predefined_split\": {\"key\": split_column}}\n",
-        "data_source = {\n",
-        "    \"big_query_data_source\": {\n",
-        "        \"big_query_table_path\": TRAINING_DATASET_BQ_PATH,\n",
-        "    },\n",
-        "}\n",
-        "window_config = {\"stride\": 1}\n",
-        "\n",
         "(\n",
         "    train_job_spec_path,\n",
         "    train_parameter_values,\n",
         ") = utils.get_bqml_arima_train_pipeline_and_parameters(\n",
         "    project=PROJECT_ID,\n",
-        "    location=DATA_REGION,\n",
+        "    location=REGION,\n",
         "    time_column=time_column,\n",
         "    time_series_identifier_column=time_series_identifier_column,\n",
-        "    target_column_name=target_column,\n",
+        "    target_column=target_column,\n",
         "    forecast_horizon=forecast_horizon,\n",
         "    data_granularity_unit=data_granularity_unit,\n",
-        "    split_spec=split_spec,\n",
-        "    data_source=data_source,\n",
-        "    window_config=window_config,\n",
+        "    predefined_split_key=split_column,\n",
+        "    data_source_bigquery_table_path=TRAINING_DATASET_BQ_PATH,\n",
+        "    window_stride_length=window_stride_length,\n",
         "    bigquery_destination_uri=arima_dataset_path,\n",
         "    override_destination=override_destination,\n",
         "    max_order=max_order,\n",
@@ -914,9 +904,9 @@
       "source": [
         "### Run the training pipeline\n",
         "\n",
-        "Use the Vertex Python SDK to kick off a training pipeline run. Once the run has started, the following cell will output a link that will allow you to monitor the run. The link should look like this: \n",
+        "Use the Vertex AI Python SDK to kick off a training pipeline run. Once the run has started, the following cell will output a link that will allow you to monitor the run. The link should look like this: \n",
         "\n",
-        "`https://console.cloud.google.com/vertex-ai/locations/[DATA_REGION]/pipelines/runs/[DISPLAY_NAME]`"
+        "`https://console.cloud.google.com/vertex-ai/locations/[REGION]/pipelines/runs/[DISPLAY_NAME]`"
       ]
     },
     {
@@ -928,8 +918,7 @@
       "outputs": [],
       "source": [
         "# The display name should be unique even if this cell is rerun.\n",
-        "now = datetime.now().strftime(\"%Y%m%d%H%M%S\")\n",
-        "DISPLAY_NAME = f\"forecasting-demo-train-{now}\"\n",
+        "DISPLAY_NAME = f\"forecasting-demo-train-{generate_uuid()}\"\n",
         "\n",
         "job = aiplatform.PipelineJob(\n",
         "    job_id=DISPLAY_NAME,\n",
@@ -1000,27 +989,11 @@
         "Now that your Model resource is trained, you can make a batch prediction using the prediction pipeline, with the following parameters:\n",
         "\n",
         "- `bigquery_destination_uri`: (optional) BigQuery Dataset URI. Used to export the metrics table and model. If not given, we will create one for the user.\n",
-        "- `data_source`: JSON for specifying the input data source URI and type. Similar to a Vertex Dataset. Currently supports BigQuery and CSV (in GCS) data sources.\n",
-        "\n",
-        "  It can look like either:\n",
-        "  ```json\n",
-        "  {\n",
-        "    \"big_query_data_source\": {\n",
-        "      \"big_query_table_path\": \"bq://[PROJECT].[DATASET].[TABLE]\"\n",
-        "    }\n",
-        "  }\n",
-        "  ```\n",
-        "  or\n",
-        "  ```json\n",
-        "  {\n",
-        "    \"csv_data_source\": {\n",
-        "      \"csv_filenames\": [ [GCS_PATHS] ],\n",
-        "  }\n",
-        "  ```\n",
+        "- `data_source_csv_filenames` or `data_source_bigquery_table_path`: A URI for either a CSV stored in GCR or a BigQuery table, respectively.\n",
         "- `generate_explanation`: If True, the predictions table will have some extra xAI columns.\n",
         "- `model_name`: Name of an existing BQML ARIMA_PLUS model to use for predictions.\n",
         "\n",
-        "The execution of the prediction pipeline will take around **5 minutes**."
+        "The execution of the prediction pipeline may take around **5 minutes**."
       ]
     },
     {
@@ -1031,14 +1004,8 @@
       },
       "outputs": [],
       "source": [
-        "data_source = {\n",
-        "    \"big_query_data_source\": {\n",
-        "        \"big_query_table_path\": PREDICTION_DATASET_BQ_PATH,\n",
-        "    },\n",
-        "}\n",
-        "\n",
         "# Get the model name programmatically, you can also find this by looking at the\n",
-        "# execution graph in Vertex Pipelines.\n",
+        "# execution graph in Vertex AI Pipelines.\n",
         "for task_detail in job.gca_resource.job_detail.task_details:\n",
         "    if task_detail.task_name == \"bigquery-create-model-job\":\n",
         "        model_name = task_detail.outputs[\"model\"].artifacts[0].metadata[\"modelId\"]\n",
@@ -1052,9 +1019,9 @@
         "    predict_parameter_values,\n",
         ") = utils.get_bqml_arima_predict_pipeline_and_parameters(\n",
         "    project=PROJECT_ID,\n",
-        "    location=DATA_REGION,\n",
+        "    location=REGION,\n",
         "    model_name=f\"{arima_dataset_path}.{model_name}\",\n",
-        "    data_source=data_source,\n",
+        "    data_source_bigquery_table_path=PREDICTION_DATASET_BQ_PATH,\n",
         "    bigquery_destination_uri=arima_dataset_path,\n",
         ")"
       ]
@@ -1067,9 +1034,9 @@
       "source": [
         "### Run the prediction pipeline\n",
         "\n",
-        "Use the Vertex Python SDK to kick off a prediction pipeline run. Once the run has started, the following cell will output a link that will allow you to monitor the run. The link should look like this: \n",
+        "Use the Vertex AI Python SDK to kick off a prediction pipeline run. Once the run has started, the following cell will output a link that will allow you to monitor the run. The link should look like this: \n",
         "\n",
-        "`https://console.cloud.google.com/vertex-ai/locations/[DATA_REGION]/pipelines/runs/[DISPLAY_NAME]`"
+        "`https://console.cloud.google.com/vertex-ai/locations/[REGION]/pipelines/runs/[DISPLAY_NAME]`"
       ]
     },
     {
@@ -1081,8 +1048,7 @@
       "outputs": [],
       "source": [
         "# The display name should be unique even if this cell is rerun.\n",
-        "now = datetime.now().strftime(\"%Y%m%d%H%M%S\")\n",
-        "DISPLAY_NAME = f\"forecasting-demo-predict-{now}\"\n",
+        "DISPLAY_NAME = f\"forecasting-demo-predict-{generate_uuid()}\"\n",
         "\n",
         "job = aiplatform.PipelineJob(\n",
         "    job_id=DISPLAY_NAME,\n",
@@ -1114,7 +1080,7 @@
       "outputs": [],
       "source": [
         "# Get the prediction table programmatically, you can also find this by looking at the\n",
-        "# execution graph in Vertex Pipelines.\n",
+        "# execution graph in Vertex AI Pipelines.\n",
         "for task_detail in job.gca_resource.job_detail.task_details:\n",
         "    if task_detail.task_name == \"bigquery-query-job\":\n",
         "        pred_table = (\n",
@@ -1239,7 +1205,7 @@
         "id": "59qKXL9ARO97"
       },
       "source": [
-        "# Compare Against Vertex Forecasting"
+        "# Compare Against Vertex AI Forecasting"
       ]
     },
     {
@@ -1268,7 +1234,7 @@
       "outputs": [],
       "source": [
         "dataset = aiplatform.TimeSeriesDataset.create(\n",
-        "    display_name=\"forecasting_demo_train\" + \"_\" + TIMESTAMP,\n",
+        "    display_name=\"forecasting_demo_train\" + \"_\" + UUID,\n",
         "    bq_source=[TRAINING_DATASET_BQ_PATH],\n",
         ")\n",
         "print(dataset.resource_name)"
@@ -1314,11 +1280,12 @@
         "    \"product\": \"categorical\",\n",
         "    \"holiday\": \"categorical\",\n",
         "}\n",
-        "available_at_forecast_columns = [\n",
+        "available_at_forecast_columns_ = [\n",
         "    \"date\",\n",
         "    \"advertisement\",\n",
         "    \"holiday\",\n",
-        "]  # @param {type: \"raw\"}\n",
+        "]\n",
+        "available_at_forecast_columns = available_at_forecast_columns_  # @param {type: \"raw\"}\n",
         "unavailable_at_forecast_columns = [\"sales\"]  # @param {type: \"raw\"}\n",
         "time_series_attribute_columns = [\"store\", \"product\"]  # @param {type: \"raw\"}\n",
         "context_window = 30  # @param {type: \"integer\"}\n",
@@ -1334,7 +1301,7 @@
       },
       "outputs": [],
       "source": [
-        "MODEL_DISPLAY_NAME = f\"forecasting-demo-model_{TIMESTAMP}\"\n",
+        "MODEL_DISPLAY_NAME = f\"forecasting-demo-model_{UUID}\"\n",
         "\n",
         "training_job = aiplatform.AutoMLForecastingTrainingJob(\n",
         "    display_name=MODEL_DISPLAY_NAME,\n",
@@ -1370,7 +1337,7 @@
         "\n",
         "The `run` method, when completed, returns the `Model` resource.\n",
         "\n",
-        "The execution of the training pipeline will take up to **one hour**. You can learn about the pricing for Vertex Forecasting [here](https://cloud.google.com/vertex-ai/pricing#tabular-data)."
+        "The execution of the training pipeline may take up to **one hour**. You can learn about the pricing for Vertex AI Forecasting [here](https://cloud.google.com/vertex-ai/pricing#tabular-data)."
       ]
     },
     {
@@ -1397,6 +1364,7 @@
         "    budget_milli_node_hours=budget_milli_node_hours,\n",
         "    model_display_name=MODEL_DISPLAY_NAME,\n",
         "    predefined_split_column_name=split_column,\n",
+        "    window_stride_length=window_stride_length,\n",
         ")"
       ]
     },
@@ -1453,7 +1421,7 @@
         "\n",
         "Now that you have backtesting metrics from both models, you can compare the two side-by-side.\n",
         "\n",
-        "Since the sales in this dataset were a function of covariates, we should expect the MAE, RMSE, and MAPE to be lower when using Vertex Forecasting. The BQML ARIMA_PLUS evaluation metrics show the relative impact of including these additional features in a model."
+        "Since the sales in this dataset were a function of covariates, we should expect the MAE, RMSE, and MAPE to be lower when using Vertex AI Forecasting. The BQML ARIMA_PLUS evaluation metrics show the relative impact of including these additional features in a model."
       ]
     },
     {
@@ -1475,7 +1443,7 @@
       "source": [
         "## Send a batch prediction request\n",
         "\n",
-        "The following section shows how you can send a batch prediction to your Vertex Forecasting model in case you want to compare the models at serving time."
+        "The following section shows how you can send a batch prediction to your Vertex AI Forecasting model in case you want to compare the models at serving time."
       ]
     },
     {
@@ -1507,7 +1475,7 @@
       "outputs": [],
       "source": [
         "batch_prediction_job = model.batch_predict(\n",
-        "    job_display_name=f\"forecasting_demo_predictions_{TIMESTAMP}\",\n",
+        "    job_display_name=f\"forecasting_demo_predictions_{UUID}\",\n",
         "    bigquery_source=PREDICTION_DATASET_BQ_PATH,\n",
         "    instances_format=\"bigquery\",\n",
         "    bigquery_destination_prefix=f\"bq://{vertex_dataset_path}\",\n",
@@ -1528,7 +1496,7 @@
         "\n",
         "Next, wait for the batch job to complete. Alternatively, you can set the parameter `sync` to `True` in the `batch_predict()` method to block until the batch prediction job is completed.\n",
         "\n",
-        "The execution of the prediction pipeline will take up to 30 minutes.\n"
+        "The execution of the prediction pipeline may take up to 30 minutes.\n"
       ]
     },
     {
@@ -1595,7 +1563,7 @@
       },
       "outputs": [],
       "source": [
-        "print(\"Click the link below to view Vertex Forecasting predictions:\")\n",
+        "print(\"Click the link below to view Vertex AI Forecasting predictions:\")\n",
         "print(\n",
         "    get_data_studio_link(\n",
         "        batch_prediction_bq_input_uri=actuals_table,\n",
@@ -1613,7 +1581,7 @@
         "id": "cleanup:mbsdk"
       },
       "source": [
-        "## Clean up Vertex and BigQuery resources\n",
+        "## Clean up Vertex AI and BigQuery resources\n",
         "\n",
         "To clean up all Google Cloud resources used in this project, you can [delete the Google Cloud\n",
         "project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#shutting_down_projects) you used for the tutorial.\n",

notebooks/official/automl/automl_tabular_on_vertex_pipelines.ipynb

@@ -33,12 +33,12 @@
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/automl/automl_tabular_on_vertex_pipelines.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl_tabular_on_vertex_pipelines.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/automl/automl_tabular_on_vertex_pipelines.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl_tabular_on_vertex_pipelines.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
@@ -855,6 +855,7 @@
         "    run_distillation=run_distillation,\n",
         "    dataflow_subnetwork=dataflow_subnetwork,\n",
         "    dataflow_use_public_ips=dataflow_use_public_ips,\n",
+        "    export_additional_model_without_custom_ops=export_additional_model_without_custom_ops,\n",
         ")\n",
         "\n",
         "job_id = \"automl-tabular-{}\".format(uuid.uuid4())\n",

notebooks/official/automl/sdk_automl_image_object_detection_batch.ipynb

@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# Copyright 2022 Google LLC\n",
+        "# Copyright 2021 Google LLC\n",
         "#\n",
         "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
         "# you may not use this file except in compliance with the License.\n",
@@ -66,17 +66,6 @@
         "This tutorial demonstrates how to use the Vertex AI SDK to create image object detection models and do batch prediction using a Google Cloud [AutoML](https://cloud.google.com/vertex-ai/docs/start/automl-users) model."
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "dataset:salads,iod"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "The dataset used for this tutorial is the Salads category of the [OpenImages dataset](https://www.tensorflow.org/datasets/catalog/open_images_v4) from [TensorFlow Datasets](https://www.tensorflow.org/datasets/catalog/overview). This dataset does not require any feature engineering. The version of the dataset you will use in this tutorial is stored in a public Cloud Storage bucket. The trained model predicts the bounding box locations and the corresponding type of salad items in an image from a class of five items: salad, seafood, tomato, baked goods, or cheese."
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -101,6 +90,17 @@
         "* Batch Prediction Service: Does a queued (batch) prediction for the entire set of instances in the background and stores the results in a Cloud Storage bucket when ready."
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "dataset:salads,iod"
+      },
+      "source": [
+        "### Dataset\n",
+        "\n",
+        "The dataset used for this tutorial is the Salads category of the [OpenImages dataset](https://www.tensorflow.org/datasets/catalog/open_images_v4) from [TensorFlow Datasets](https://www.tensorflow.org/datasets/catalog/overview). This dataset does not require any feature engineering. The version of the dataset you will use in this tutorial is stored in a public Cloud Storage bucket. The trained model predicts the bounding box locations and the corresponding type of salad items in an image from a class of five items: salad, seafood, tomato, baked goods, or cheese."
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -201,7 +201,7 @@
       },
       "outputs": [],
       "source": [
-        "! pip3 install -U google-cloud-storage $USER_FLAG"
+        "! pip3 install -U --upgrade tensorflow google-cloud-storage $USER_FLAG"
       ]
     },
     {
@@ -213,17 +213,6 @@
         "Install the latest version of *tensorflow* library."
       ]
     },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "install_tensorflow"
-      },
-      "outputs": [],
-      "source": [
-        "! pip3 install --upgrade tensorflow $USER_FLAG"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -383,9 +372,9 @@
         "id": "timestamp"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -396,9 +385,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -409,7 +405,7 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Google Cloud Notebooks**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Google Cloud Notebooks**, your environment is already authenticated.\n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -494,7 +490,7 @@
       "outputs": [],
       "source": [
         "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
-        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP"
+        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + UUID"
       ]
     },
     {
@@ -669,7 +665,7 @@
       "outputs": [],
       "source": [
         "dataset = aiplatform.ImageDataset.create(\n",
-        "    display_name=\"Salads\" + \"_\" + TIMESTAMP,\n",
+        "    display_name=\"Salads\" + \"_\" + UUID,\n",
         "    gcs_source=[IMPORT_FILE],\n",
         "    import_schema_uri=aiplatform.schema.dataset.ioformat.image.bounding_box,\n",
         ")\n",
@@ -717,7 +713,7 @@
       "outputs": [],
       "source": [
         "job = aiplatform.AutoMLImageTrainingJob(\n",
-        "    display_name=\"salads_\" + TIMESTAMP,\n",
+        "    display_name=\"salads_\" + UUID,\n",
         "    prediction_type=\"object_detection\",\n",
         "    multi_label=False,\n",
         "    model_type=\"CLOUD\",\n",
@@ -760,7 +756,7 @@
       "source": [
         "model = job.run(\n",
         "    dataset=dataset,\n",
-        "    model_display_name=\"salads_\" + TIMESTAMP,\n",
+        "    model_display_name=\"salads_\" + UUID,\n",
         "    training_fraction_split=0.8,\n",
         "    validation_fraction_split=0.1,\n",
         "    test_fraction_split=0.1,\n",
@@ -790,7 +786,7 @@
       "outputs": [],
       "source": [
         "# Get model resource ID\n",
-        "models = aiplatform.Model.list(filter=\"display_name=salads_\" + TIMESTAMP)\n",
+        "models = aiplatform.Model.list(filter=\"display_name=salads_\" + UUID)\n",
         "\n",
         "# Get a reference to the Model Service client\n",
         "client_options = {\"api_endpoint\": f\"{REGION}-aiplatform.googleapis.com\"}\n",
@@ -961,7 +957,7 @@
       "outputs": [],
       "source": [
         "batch_predict_job = model.batch_predict(\n",
-        "    job_display_name=\"salads_\" + TIMESTAMP,\n",
+        "    job_display_name=\"salads_\" + UUID,\n",
         "    gcs_source=gcs_input_uri,\n",
         "    gcs_destination_prefix=BUCKET_URI,\n",
         "    machine_type=\"n1-standard-4\",\n",

notebooks/official/automl/sdk_automl_tabular_forecasting_batch.ipynb

@@ -44,7 +44,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/notebooks/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_tabular_forecasting_batch.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/automl/sdk_automl_tabular_forecasting_batch.ipynb\">\n",
         "        <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -68,18 +68,7 @@
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "dataset:covid,forecast"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "The dataset used for this tutorial a time series dataset containing samples drawn from the Iowa Liquor Retail Sales dataset. Data were made available by the Iowa Department of Commerce. It is provided under the Creative Commons Zero v1.0 Universal license. For more details, see: https://console.cloud.google.com/marketplace/product/iowa-department-of-commerce/iowa-liquor-sales. This dataset does not require any feature engineering. The version of the dataset you will use in this tutorial is stored in BigQuery."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "objective:automl,training,batch_prediction"
+        "id": "02b9af111927"
       },
       "source": [
         "### Objective\n",
@@ -97,7 +86,18 @@
         "- Create a `Vertex AI Dataset` resource.\n",
         "- Train an `AutoML` tabular forecasting `Model` resource.\n",
         "- Obtain the evaluation metrics for the `Model` resource.\n",
-        "- Make a batch prediction.\n"
+        "- Make a batch prediction."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "dataset:covid,forecast"
+      },
+      "source": [
+        "### Dataset\n",
+        "\n",
+        "The dataset used for this tutorial is a time series dataset containing samples drawn from the Iowa Liquor Retail Sales dataset. Data is made available by the Iowa Department of Commerce. It is provided under the Creative Commons Zero v1.0 Universal license. For more details, see: https://console.cloud.google.com/marketplace/product/iowa-department-of-commerce/iowa-liquor-sales. This dataset does not require any feature engineering. The version of the dataset you use in this tutorial is stored in BigQuery."
       ]
     },
     {
@@ -128,29 +128,38 @@
       "source": [
         "### Set up your local development environment\n",
         "\n",
-        "If you are using Colab or Workbench AI Notebooks, your environment already meets all the requirements to run this notebook. You can skip this step.\n",
+        "**If you are using Colab or Vertex AI Workbench Notebooks**, your environment already meets\n",
+        "all the requirements to run this notebook. You can skip this step.\n",
         "\n",
-        "Otherwise, make sure your environment meets this notebook's requirements. You need the following:\n",
+        "**Otherwise**, make sure your environment meets this notebook's requirements.\n",
+        "You need the following:\n",
         "\n",
-        "- The Cloud Storage SDK\n",
-        "- Git\n",
-        "- Python 3\n",
-        "- virtualenv\n",
-        "- Jupyter notebook running in a virtual environment with Python 3\n",
+        "* The Google Cloud SDK\n",
+        "* Git\n",
+        "* Python 3\n",
+        "* virtualenv\n",
+        "* Jupyter notebook running in a virtual environment with Python 3\n",
         "\n",
-        "The Cloud Storage guide to [Setting up a Python development environment](https://cloud.google.com/python/setup) and the [Jupyter installation guide](https://jupyter.org/install) provide detailed instructions for meeting these requirements. The following steps provide a condensed set of instructions:\n",
+        "The Google Cloud guide to [Setting up a Python development\n",
+        "environment](https://cloud.google.com/python/setup) and the [Jupyter\n",
+        "installation guide](https://jupyter.org/install) provide detailed instructions\n",
+        "for meeting these requirements. The following steps provide a condensed set of\n",
+        "instructions:\n",
         "\n",
-        "1. [Install and initialize the SDK](https://cloud.google.com/sdk/docs/).\n",
+        "1. [Install and initialize the Cloud SDK.](https://cloud.google.com/sdk/docs/)\n",
         "\n",
-        "2. [Install Python 3](https://cloud.google.com/python/setup#installing_python).\n",
+        "1. [Install Python 3.](https://cloud.google.com/python/setup#installing_python)\n",
         "\n",
-        "3. [Install virtualenv](https://cloud.google.com/python/setup#installing_and_using_virtualenv) and create a virtual environment that uses Python 3.  Activate the virtual environment.\n",
+        "1. [Install\n",
+        "   virtualenv](https://cloud.google.com/python/setup#installing_and_using_virtualenv)\n",
+        "   and create a virtual environment that uses Python 3. Activate the virtual environment.\n",
         "\n",
-        "4. To install Jupyter, run `pip3 install jupyter` on the command-line in a terminal shell.\n",
+        "1. To install Jupyter, run `pip3 install jupyter` on the\n",
+        "command-line in a terminal shell.\n",
         "\n",
-        "5. To launch Jupyter, run `jupyter notebook` on the command-line in a terminal shell.\n",
+        "1. To launch Jupyter, run `jupyter notebook` on the command-line in a terminal shell.\n",
         "\n",
-        "6. Open this notebook in the Jupyter Notebook Dashboard.\n"
+        "1. Open this notebook in the Jupyter Notebook Dashboard."
       ]
     },
     {
@@ -161,7 +170,7 @@
       "source": [
         "## Installation\n",
         "\n",
-        "Install the latest version of Vertex AI SDK for Python."
+        "Install the following packages required to execute this notebook. "
       ]
     },
     {
@@ -175,7 +184,7 @@
         "import os\n",
         "\n",
         "# The Vertex AI Workbench Notebook product has specific requirements\n",
-        "IS_WORKBENCH_NOTEBOOK = os.getenv(\"DL_ANACONDA_HOME\") and not os.getenv(\"VIRTUAL_ENV\")\n",
+        "IS_WORKBENCH_NOTEBOOK = os.getenv(\"DL_ANACONDA_HOME\")\n",
         "IS_USER_MANAGED_WORKBENCH_NOTEBOOK = os.path.exists(\n",
         "    \"/opt/deeplearning/metadata/env_version\"\n",
         ")\n",
@@ -185,8 +194,7 @@
         "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
         "\n",
-        "! pip3 install --upgrade google-cloud-aiplatform $USER_FLAG -q\n",
-        "! pip3 install --upgrade tensorflow $USER_FLAG -q"
+        "! pip3 install --upgrade google-cloud-aiplatform $USER_FLAG -q"
       ]
     },
     {
@@ -197,7 +205,7 @@
       "source": [
         "### Restart the kernel\n",
         "\n",
-        "Once you've installed the additional packages, you need to restart the notebook kernel so it can find the packages."
+        "After you install the additional packages, you need to restart the notebook kernel so it can find the packages."
       ]
     },
     {
@@ -208,6 +216,7 @@
       },
       "outputs": [],
       "source": [
+        "# Automatically restart kernel after installs\n",
         "import os\n",
         "\n",
         "if not os.getenv(\"IS_TESTING\"):\n",
@@ -218,34 +227,48 @@
         "    app.kernel.do_shutdown(True)"
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "0e3cab0cc491"
+      },
+      "source": [
+        "## Before you begin"
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
         "id": "before_you_begin:nogpu"
       },
       "source": [
-        "## Before you begin\n",
-        "\n",
-        "### GPU runtime\n",
-        "\n",
-        "This tutorial does not require a GPU runtime.\n",
-        "\n",
         "### Set up your Google Cloud project\n",
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
         "1. [Select or create a Google Cloud project](https://console.cloud.google.com/cloud-resource-manager). When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
         "\n",
-        "2. [Make sure that billing is enabled for your project.](https://cloud.google.com/billing/docs/how-to/modify-project)\n",
+        "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
         "\n",
-        "3. [Enable the following APIs: Vertex AI APIs, Compute Engine APIs, and Cloud Storage.](https://console.cloud.google.com/flows/enableapi?apiid=ml.googleapis.com,compute_component,storage-component.googleapis.com)\n",
+        "1. [Enable the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com). \n",
         "\n",
-        "4. If you are running this notebook locally, you will need to install the [Cloud SDK]((https://cloud.google.com/sdk)).\n",
+        "1. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
         "\n",
-        "5. Enter your project ID in the cell below. Then run the  cell to make sure the\n",
+        "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
         "Cloud SDK uses the right project for all the commands in this notebook.\n",
         "\n",
-        "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$`."
+        "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$` into these commands."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "1460fd744366"
+      },
+      "source": [
+        "#### Set your project ID\n",
+        "\n",
+        "**If you don't know your project ID**, you may be able to get your project ID using `gcloud`."
       ]
     },
     {
@@ -294,7 +317,7 @@
         "#### Region\n",
         "\n",
         "You can also change the `REGION` variable, which is used for operations\n",
-        "throughout the rest of this notebook.  Below are regions supported for Vertex AI. We recommend that you choose the region closest to you.\n",
+        "throughout the rest of this notebook.  Below are regions supported for Vertex AI. It is recommended that you choose the region closest to you.\n",
         "\n",
         "- Americas: `us-central1`\n",
         "- Europe: `europe-west4`\n",
@@ -302,7 +325,7 @@
         "\n",
         "You may not use a multi-regional bucket for training with Vertex AI. Not all regions provide support for all Vertex AI services.\n",
         "\n",
-        "Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations)"
+        "Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations)."
       ]
     },
     {
@@ -325,9 +348,9 @@
         "id": "timestamp"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -338,9 +361,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -351,23 +381,31 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Workbench AI Notebooks**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Vertex AI Workbench Notebooks**, your environment is already\n",
+        "authenticated. Skip this step.\n",
         "\n",
-        "**If you are using Colab**, run the cell below and follow the instructions when prompted to authenticate your account via oAuth.\n",
+        "**If you are using Colab**, run the cell below and follow the instructions\n",
+        "when prompted to authenticate your account via oAuth.\n",
         "\n",
         "**Otherwise**, follow these steps:\n",
         "\n",
-        "In the Cloud Console, go to the [Create service account key](https://console.cloud.google.com/apis/credentials/serviceaccountkey) page.\n",
+        "1. In the Cloud Console, go to the [**Create service account key**\n",
+        "   page](https://console.cloud.google.com/apis/credentials/serviceaccountkey).\n",
         "\n",
-        "**Click Create service account**.\n",
+        "2. Click **Create service account**.\n",
         "\n",
-        "In the **Service account name** field, enter a name, and click **Create**.\n",
+        "3. In the **Service account name** field, enter a name, and\n",
+        "   click **Create**.\n",
         "\n",
-        "In the **Grant this service account access to project** section, click the Role drop-down list. Type \"Vertex\" into the filter box, and select **Vertex Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
+        "4. In the **Grant this service account access to project** section, click the **Role** drop-down list. Type \"Vertex AI\"\n",
+        "into the filter box, and select\n",
+        "   **Vertex AI Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
         "\n",
-        "Click Create. A JSON file that contains your key downloads to your local environment.\n",
+        "5. Click *Create*. A JSON file that contains your key downloads to your\n",
+        "local environment.\n",
         "\n",
-        "Enter the path to your service account key as the GOOGLE_APPLICATION_CREDENTIALS variable in the cell below and run the cell."
+        "6. Enter the path to your service account key as the\n",
+        "`GOOGLE_APPLICATION_CREDENTIALS` variable in the cell below and run the cell.\n"
       ]
     },
     {
@@ -438,9 +476,9 @@
       },
       "outputs": [],
       "source": [
-        "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
-        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + TIMESTAMP\n",
-        "    BUCKET_URI = \"gs://\" + BUCKET_NAME"
+        "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
+        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + UUID\n",
+        "    BUCKET_URI = f\"gs://{BUCKET_NAME}\""
       ]
     },
     {
@@ -460,7 +498,7 @@
       },
       "outputs": [],
       "source": [
-        "! gsutil mb -l $REGION $BUCKET_URI"
+        "! gsutil mb -l $REGION -p $PROJECT_ID $BUCKET_URI"
       ]
     },
     {
@@ -489,9 +527,6 @@
         "id": "setup_vars"
       },
       "source": [
-        "### Set up variables\n",
-        "\n",
-        "Next, set up some variables used throughout the tutorial.\n",
         "### Import libraries and define constants"
       ]
     },
@@ -503,7 +538,10 @@
       },
       "outputs": [],
       "source": [
-        "import google.cloud.aiplatform as aiplatform"
+        "import urllib\n",
+        "\n",
+        "import google.cloud.aiplatform as aiplatform\n",
+        "from google.cloud import bigquery"
       ]
     },
     {
@@ -589,7 +627,7 @@
       "outputs": [],
       "source": [
         "dataset = aiplatform.TimeSeriesDataset.create(\n",
-        "    display_name=\"iowa_liquor_sales_train\" + \"_\" + TIMESTAMP,\n",
+        "    display_name=\"iowa_liquor_sales_train\" + \"_\" + UUID,\n",
         "    bq_source=[TRAINING_DATASET_BQ_PATH],\n",
         ")\n",
         "\n",
@@ -649,7 +687,7 @@
       },
       "outputs": [],
       "source": [
-        "MODEL_DISPLAY_NAME = f\"iowa-liquor-sales-forecast-model_{TIMESTAMP}\"\n",
+        "MODEL_DISPLAY_NAME = f\"iowa-liquor-sales-forecast-model_{UUID}\"\n",
         "\n",
         "training_job = aiplatform.AutoMLForecastingTrainingJob(\n",
         "    display_name=MODEL_DISPLAY_NAME,\n",
@@ -772,11 +810,7 @@
       },
       "outputs": [],
       "source": [
-        "import os\n",
-        "\n",
-        "from google.cloud import bigquery\n",
-        "\n",
-        "batch_predict_bq_output_dataset_name = f\"iowa_liquor_sales_predictions_{TIMESTAMP}\"\n",
+        "batch_predict_bq_output_dataset_name = f\"iowa_liquor_sales_predictions_{UUID}\"\n",
         "batch_predict_bq_output_dataset_path = \"{}.{}\".format(\n",
         "    PROJECT_ID, batch_predict_bq_output_dataset_name\n",
         ")\n",
@@ -820,7 +854,7 @@
         ")\n",
         "\n",
         "batch_prediction_job = model.batch_predict(\n",
-        "    job_display_name=f\"iowa_liquor_sales_forecasting_predictions_{TIMESTAMP}\",\n",
+        "    job_display_name=f\"iowa_liquor_sales_forecasting_predictions_{UUID}\",\n",
         "    bigquery_source=PREDICTION_DATASET_BQ_PATH,\n",
         "    instances_format=\"bigquery\",\n",
         "    bigquery_destination_prefix=batch_predict_bq_output_uri_prefix,\n",
@@ -901,8 +935,6 @@
       },
       "outputs": [],
       "source": [
-        "import urllib\n",
-        "\n",
         "tables = client.list_tables(batch_predict_bq_output_dataset_path)\n",
         "\n",
         "prediction_table_id = \"\"\n",
@@ -1012,9 +1044,6 @@
       },
       "outputs": [],
       "source": [
-        "# Set this to true only if you'd like to delete your bucket\n",
-        "delete_bucket = False\n",
-        "\n",
         "# Delete dataset\n",
         "dataset.delete()\n",
         "\n",
@@ -1027,6 +1056,9 @@
         "# Delete batch prediction job\n",
         "batch_prediction_job.delete()\n",
         "\n",
+        "# Set this to true only if you'd like to delete your bucket\n",
+        "delete_bucket = False\n",
+        "\n",
         "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
         "    ! gsutil rm -r $BUCKET_URI"
       ]

notebooks/official/automl/sdk_automl_tabular_regression_batch_bq.ipynb

@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# Copyright 2022 Google LLC\n",
+        "# Copyright 2022 Google LLC.\n",
         "#\n",
         "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
         "# you may not use this file except in compliance with the License.\n",

notebooks/official/bigquery_ml/bqml-online-prediction.ipynb

@@ -32,18 +32,18 @@
         "<table align=\"left\">\n",
         "\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/community/bigquery_ml/bqml-online-prediction.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/bigquery_ml/bqml-online-prediction.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/community/bigquery_ml/bqml-online-prediction.ipynb\">\n",
+        "    <a href=\"https://github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/bigquery_ml/bqml-online-prediction.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/community/bigquery_ml/bqml-online-prediction.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/bigquery_ml/bqml-online-prediction.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -63,7 +63,7 @@
         "\n",
         "### Dataset\n",
         "\n",
-        "The dataset, [available publicly on BigQuery](https://console.cloud.google.com/bigquery?project=bigquery-public-data&d=ga4_obfuscated_sample_ecommerce&p=bigquery-public-data&page=dataset), comes from obfuscated [Google Analytics 4 data](https://support.google.com/analytics/answer/10937659) from the [Google Merchandise Store](https://shop.googlemerchandisestore.com/).\n",
+        "The dataset, <a href=\"https://console.cloud.google.com/bigquery?project=bigquery-public-data&d=ga4_obfuscated_sample_ecommerce&p=bigquery-public-data&page=dataset\" target=\"_blank\">available publicly on BigQuery</a>, comes from obfuscated <a href=\"https://support.google.com/analytics/answer/10937659\" target=\"_blank\">Google Analytics 4 data</a> from the <a href=\"https://shop.googlemerchandisestore.com/\" target=\"_blank\">Google Merchandise Store</a>).\n",
         "\n",
         "### Objective\n",
         "\n",
@@ -95,9 +95,9 @@
         "* Vertex AI\n",
         "\n",
         "\n",
-        "Learn about [BigQuery Pricing](https://cloud.google.com/bigquery/pricing), [BigQuery ML pricing](https://cloud.google.com/bigquery-ml/pricing), [Vertex AI\n",
-        "pricing](https://cloud.google.com/vertex-ai/pricing), and use the [Pricing\n",
-        "Calculator](https://cloud.google.com/products/calculator/)\n",
+        "Learn about <a href=\"https://cloud.google.com/bigquery/pricing\" target=\"_blank\">BigQuery Pricing</a>, <a href=\"https://cloud.google.com/bigquery-ml/pricing\" target=\"_blank\">BigQuery ML pricing</a>, <a href=\"https://cloud.google.com/vertex-ai/pricing\" target=\"_blank\">Vertex AI\n",
+        "pricing</a>, and use the <a href=\"https://cloud.google.com/products/calculator/\" target=\"_blank\">Pricing\n",
+        "Calculator</a>\n",
         "to generate a cost estimate based on your projected usage."
       ]
     },
@@ -128,18 +128,18 @@
         "* virtualenv\n",
         "* Jupyter notebook running in a virtual environment with Python 3\n",
         "\n",
-        "The Google Cloud guide to [Setting up a Python development\n",
-        "environment](https://cloud.google.com/python/setup) and the [Jupyter\n",
-        "installation guide](https://jupyter.org/install) provide detailed instructions\n",
+        "The Google Cloud guide to <a href=\"https://cloud.google.com/python/setup\" target=\"_blank\">Setting up a Python development\n",
+        "environment</a> and the <a href=\"https://jupyter.org/install\" target=\"_blank\">Jupyter\n",
+        "installation guide</a> provide detailed instructions\n",
         "for meeting these requirements. The following steps provide a condensed set of\n",
         "instructions:\n",
         "\n",
-        "1. [Install and initialize the Cloud SDK.](https://cloud.google.com/sdk/docs/)\n",
+        "1. <a href=\"https://cloud.google.com/sdk/docs/\" target=\"_blank\">Install and initialize the Cloud SDK.</a>\n",
         "\n",
-        "1. [Install Python 3.](https://cloud.google.com/python/setup#installing_python)\n",
+        "1. <a href=\"https://cloud.google.com/python/setup#installing_python\" target=\"_blank\">Install Python 3.</a>\n",
         "\n",
-        "1. [Install\n",
-        "   virtualenv](https://cloud.google.com/python/setup#installing_and_using_virtualenv)\n",
+        "1. <a href=\"https://cloud.google.com/python/setup#installing_and_using_virtualenv\" target=\"_blank\">Install\n",
+        "   virtualenv</a>\n",
         "   and create a virtual environment that uses Python 3. Activate the virtual environment.\n",
         "\n",
         "1. To install Jupyter, run `pip3 install jupyter` on the\n",
@@ -234,13 +234,13 @@
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "1. [Select or create a Google Cloud project](https://console.cloud.google.com/cloud-resource-manager). When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
+        "1. <a href=\"https://console.cloud.google.com/cloud-resource-manager\" target=\"_blank\">Select or create a Google Cloud project</a>. When you first create an account, you get a $300 free credit towards your compute/storage costs.\n",
         "\n",
-        "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
+        "1. <a href=\"https://cloud.google.com/billing/docs/how-to/modify-project\" target=\"_blank\">Make sure that billing is enabled for your project</a>.\n",
         "\n",
-        "1. [Enable the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com).\n",
+        "1. <a href=\"https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com\" target=\"_blank\">Enable the Vertex AI API</a>.\n",
         "\n",
-        "1. If you are running this notebook locally, you will need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
+        "1. If you are running this notebook locally, you will need to install the <a href=\"https://cloud.google.com/sdk\" target=\"_blank\">Cloud SDK</a>.\n",
         "\n",
         "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
         "Cloud SDK uses the right project for all the commands in this notebook.\n",
@@ -267,7 +267,7 @@
       },
       "outputs": [],
       "source": [
-        "PROJECT_ID = \"YOUR-PROJECT-ID\"\n",
+        "PROJECT_ID = \"[YOUR-PROJECT-ID]\"\n",
         "\n",
         "# Get your Google Cloud project ID from gcloud\n",
         "import os\n",
@@ -314,9 +314,9 @@
         "- Europe: `europe-west4`\n",
         "- Asia Pacific: `asia-east1`\n",
         "\n",
-        "You may not use a multi-regional bucket for training with Vertex AI. Not all regions provide support for all Vertex AI services.\n",
+        "You might not be able to use a multi-regional bucket for training with Vertex AI. Not all regions provide support for all Vertex AI services.\n",
         "\n",
-        "Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations)."
+        "Learn more about <a href=\"https://cloud.google.com/vertex-ai/docs/general/locations\" target=\"_blank\">Vertex AI regions</a>."
       ]
     },
     {
@@ -339,9 +339,9 @@
         "id": "06571eb4063b"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append it onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -352,9 +352,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -380,8 +387,7 @@
         "\n",
         "**Otherwise**, follow these steps:\n",
         "\n",
-        "1. In the Cloud Console, go to the [**Create service account key**\n",
-        "   page](https://console.cloud.google.com/apis/credentials/serviceaccountkey).\n",
+        "1. In the Cloud Console, go to the <a href=\"https://console.cloud.google.com/apis/credentials/serviceaccountkey\" target=\"_blank\">**Create service account key** page</a>.\n",
         "\n",
         "2. Click **Create service account**.\n",
         "\n",
@@ -486,7 +492,10 @@
       },
       "outputs": [],
       "source": [
+        "from typing import Union\n",
+        "\n",
         "import google.cloud.aiplatform as vertex_ai\n",
+        "import pandas as pd\n",
         "from google.cloud import bigquery"
       ]
     },
@@ -550,24 +559,17 @@
       "outputs": [],
       "source": [
         "# Wrapper to use BigQuery client to run query/job, return job ID or result as DF\n",
-        "def bq_query(sql):\n",
+        "def run_bq_query(sql: str) -> Union[str, pd.DataFrame]:\n",
         "    \"\"\"\n",
         "    Input: SQL query, as a string, to execute in BigQuery\n",
         "    Returns the query results as a pandas DataFrame, or error, if any\n",
         "    \"\"\"\n",
-        "    # Import Exceptions library to help with dataset error catching\n",
-        "    from google.cloud.exceptions import BadRequest\n",
         "\n",
         "    # Try dry run before executing query to catch any errors\n",
-        "    try:\n",
-        "        job_config = bigquery.QueryJobConfig(dry_run=True, use_query_cache=False)\n",
-        "\n",
-        "        bq_client.query(sql, job_config=job_config)\n",
-        "\n",
-        "    except BadRequest as err:\n",
-        "        print(err)\n",
-        "        return\n",
+        "    job_config = bigquery.QueryJobConfig(dry_run=True, use_query_cache=False)\n",
+        "    bq_client.query(sql, job_config=job_config)\n",
         "\n",
+        "    # If dry run succeeds without errors, proceed to run query\n",
         "    job_config = bigquery.QueryJobConfig()\n",
         "    client_result = bq_client.query(sql, job_config=job_config)\n",
         "\n",
@@ -589,7 +591,7 @@
         "\n",
         "BigQuery ML (BQML) provides the capability to train ML tabular models, such as classification, regression, forecasting, and matrix factorization, in BigQuery using SQL syntax directly. BigQuery ML uses the scalable infrastructure of BigQuery ML so you don't need to set up additional infrastructure for training or batch serving.\n",
         "\n",
-        "Learn more about [BigQuery ML documentation](https://cloud.google.com/bigquery-ml/docs)."
+        "Learn more about <a href=\"https://cloud.google.com/bigquery-ml/docs\" target=\"_blank\">BigQuery ML documentation</a>."
       ]
     },
     {
@@ -600,9 +602,13 @@
       },
       "outputs": [],
       "source": [
-        "BQ_DATASET_NAME = \"ga4_churnprediction\"\n",
+        "BQ_DATASET_NAME = f\"ga4_churnprediction_{UUID}\"\n",
         "\n",
-        "bq_query(f\"\"\"CREATE SCHEMA IF NOT EXISTS {BQ_DATASET_NAME}\"\"\")"
+        "sql_create_dataset = f\"\"\"CREATE SCHEMA IF NOT EXISTS {BQ_DATASET_NAME}\"\"\"\n",
+        "\n",
+        "print(sql_create_dataset)\n",
+        "\n",
+        "run_bq_query(sql_create_dataset)"
       ]
     },
     {
@@ -620,7 +626,7 @@
         "id": "49dd00d5fbe5"
       },
       "source": [
-        "Inpect data that has been pre-processed from [Google Analytics 4 data from the Google Merchandise Store](https://support.google.com/analytics/answer/10937659) so that it can be used for classification. For more information on how this data was prepared, read [this blog post](https://cloud.google.com/blog/topics/developers-practitioners/churn-prediction-game-developers-using-google-analytics-4-ga4-and-bigquery-ml).\n",
+        "Inpect data that has been pre-processed from <a href=\"https://support.google.com/analytics/answer/10937659\" target=\"_blank\">Google Analytics 4 data from the Google Merchandise Store</a> so that it can be used for classification. For more information on how this data was prepared, read <a href=\"https://cloud.google.com/blog/topics/developers-practitioners/churn-prediction-game-developers-using-google-analytics-4-ga4-and-bigquery-ml\" target=\"_blank\">this blog post</a>.\n",
         "\n",
         "As seen below, each row represents a single user, and the columns represent their demographic features, their aggregated behavioral features in the first 24 hours of visiting the Google Merchandise Store, and the label (whether the user churned or returned any time after the first 24 hours)."
       ]
@@ -641,7 +647,7 @@
         "LIMIT\n",
         "    100\n",
         "\"\"\"\n",
-        "bq_query(sql_inspect)"
+        "run_bq_query(sql_inspect)"
       ]
     },
     {
@@ -662,9 +668,9 @@
         "The query below trains a logistic regression model using BigQuery ML. BigQuery resources are used to train the model.\n",
         "\n",
         "In the `OPTIONS` parameter:\n",
-        "* with `model_registry=\"vertex_ai\"`, the BigQuery ML model will automatically be [registered to Vertex AI Model Registry](https://cloud.google.com/vertex-ai/docs/model-registry/model-registry-bqml), which enables you to view all of your registered models and its versions on Google Cloud in one place.\n",
+        "* with `model_registry=\"vertex_ai\"`, the BigQuery ML model will automatically be <a href=\"https://cloud.google.com/vertex-ai/docs/model-registry/model-registry-bqml\" target=\"_blank\">registered to Vertex AI Model Registry</a>, which enables you to view all of your registered models and its versions on Google Cloud in one place.\n",
         "\n",
-        "* `vertex_ai_model_version_aliases allows you to set aliases to help you keep track of your model version ([documentation](https://cloud.google.com/vertex-ai/docs/model-registry/model-alias))."
+        "* `vertex_ai_model_version_aliases allows you to set aliases to help you keep track of your model version (<a href=\"https://cloud.google.com/vertex-ai/docs/model-registry/model-alias\" target=\"_blank\">documentation</a>)."
       ]
     },
     {
@@ -677,7 +683,7 @@
       "source": [
         "# this cell may take ~1 min to run\n",
         "\n",
-        "BQML_MODEL_NAME = \"bqmlmodelchurn\"\n",
+        "BQML_MODEL_NAME = f\"bqml_model_churn_{UUID}\"\n",
         "\n",
         "sql_train_model_bqml = f\"\"\"\n",
         "CREATE OR REPLACE MODEL {BQ_DATASET_NAME}.{BQML_MODEL_NAME}    \n",
@@ -696,7 +702,7 @@
         "\n",
         "print(sql_train_model_bqml)\n",
         "\n",
-        "bq_query(sql_train_model_bqml)"
+        "run_bq_query(sql_train_model_bqml)"
       ]
     },
     {
@@ -714,7 +720,7 @@
         "id": "2aaaae772f67"
       },
       "source": [
-        "With the model created, you can now evaluate the logistic regression model. Behind the scenes, BigQuery ML automatically [split the data](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-create#data_split_method), which makes it easier to quickly train and evaluate models."
+        "With the model created, you can now evaluate the logistic regression model. Behind the scenes, BigQuery ML automatically <a href=\"https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-create#data_split_method\" target=\"_blank\">split the data</a>, which makes it easier to quickly train and evaluate models."
       ]
     },
     {
@@ -734,7 +740,7 @@
         "\n",
         "print(sql_evaluate_model)\n",
         "\n",
-        "bq_query(sql_evaluate_model)"
+        "run_bq_query(sql_evaluate_model)"
       ]
     },
     {
@@ -745,7 +751,7 @@
       "source": [
         "These metrics help you understand the performance of the model. \n",
         "\n",
-        "There are various metrics for logistic regression and other model types (full list of metrics can be found in the [documentation](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-evaluate#mlevaluate_output))."
+        "There are various metrics for logistic regression and other model types (full list of metrics can be found in the <a href=\"https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-evaluate#mlevaluate_output\" target=\"_blank\">documentation</a>)."
       ]
     },
     {
@@ -765,7 +771,7 @@
       "source": [
         "Make a batch prediction in BigQuery ML on the original training data to check the probability of churn for each of the users, as seen in the `probability` column, with the predicted label under the `predicted_churn` column.\n",
         "\n",
-        "[ML.EXPLAIN_PREDICT](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-explain-predict) has built-in [Explainable AI](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-xai-overview). This allows you to see the top contributing features to each prediction and interpret how it was computed."
+        "<a href=\"https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-explain-predict\" target=\"_blank\">ML.EXPLAIN_PREDICT</a> has built-in <a href=\"https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-xai-overview\" target=\"_blank\">Explainable AI</a>. This allows you to see the top contributing features to each prediction and interpret how it was computed."
       ]
     },
     {
@@ -787,7 +793,7 @@
         "\n",
         "print(sql_explain_predict)\n",
         "\n",
-        "bq_query(sql_explain_predict)"
+        "run_bq_query(sql_explain_predict)"
       ]
     },
     {
@@ -796,7 +802,7 @@
         "id": "fa1f96c0f452"
       },
       "source": [
-        "Since the `top_feature_attributions` is a nested column, you can unnest the array ([documentation](https://cloud.google.com/bigquery/docs/reference/standard-sql/arrays)) into separate rows for each of the features. In other words, since ML.EXPLAIN_PREDICT provides the top 5 most important features, using `UNNEST` results in 5 rows per prediction:"
+        "Since the `top_feature_attributions` is a nested column, you can unnest the array (<a href=\"https://cloud.google.com/bigquery/docs/reference/standard-sql/arrays\" target=\"_blank\">documentation</a>) into separate rows for each of the features. In other words, since ML.EXPLAIN_PREDICT provides the top 5 most important features, using `UNNEST` results in 5 rows per prediction:"
       ]
     },
     {
@@ -827,7 +833,7 @@
         "\n",
         "print(sql_explain_predict)\n",
         "\n",
-        "bq_query(sql_explain_predict)"
+        "run_bq_query(sql_explain_predict)"
       ]
     },
     {
@@ -847,7 +853,7 @@
       "source": [
         "When the model was trained in BigQuery ML, the line `model_registry=\"vertex_ai\"` registered the model to Vertex AI Model Registry automatically upon completion.\n",
         "\n",
-        "You can view the model on the [Vertex AI Model Registry page](https://console.cloud.google.com/vertex-ai/models), or use the code below to check that it was successfully registered:"
+        "You can view the model on the <a href=\"https://console.cloud.google.com/vertex-ai/models\" target=\"_blank\">Vertex AI Model Registry page</a>, or use the code below to check that it was successfully registered:"
       ]
     },
     {
@@ -858,12 +864,7 @@
       },
       "outputs": [],
       "source": [
-        "print(f\"BQML_MODEL_NAME = {BQML_MODEL_NAME}\")\n",
-        "\n",
-        "models = vertex_ai.Model.list(\n",
-        "    filter=f\"display_name={BQML_MODEL_NAME}\", order_by=\"update_time\"\n",
-        ")\n",
-        "model = models[0]\n",
+        "model = vertex_ai.Model(model_name=BQML_MODEL_NAME)\n",
         "\n",
         "print(model.gca_resource)"
       ]
@@ -883,7 +884,7 @@
         "id": "b6120dcc1ff6"
       },
       "source": [
-        "While BigQuery ML supports batch prediction with [ML.PREDICT](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-predict) and [ML.EXPLAIN_PREDICT](https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-explain-predict), BigQuery ML is not suitable for real-time predictions where you need low latency predictions with potentially high frequency of requests.\n",
+        "While BigQuery ML supports batch prediction with <a href=\"https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-predict\" target=\"_blank\">ML.PREDICT</a> and <a href=\"https://cloud.google.com/bigquery-ml/docs/reference/standard-sql/bigqueryml-syntax-explain-predict\" target=\"_blank\">ML.EXPLAIN_PREDICT</a>, BigQuery ML is not suitable for real-time predictions where you need low latency predictions with potentially high frequency of requests.\n",
         "\n",
         "In other words, deploying the BigQuery ML model to an endpoint enables you to do online predictions."
       ]
@@ -906,30 +907,6 @@
         "To deploy your model to an endpoint, you will first need to create an endpoint before you deploy the model to it."
       ]
     },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "3ce73125dff6"
-      },
-      "outputs": [],
-      "source": [
-        "def create_endpoint(\n",
-        "    project: str,\n",
-        "    display_name: str,\n",
-        "    location: str,\n",
-        "):\n",
-        "    endpoint = vertex_ai.Endpoint.create(\n",
-        "        display_name=display_name,\n",
-        "        project=project,\n",
-        "        location=location,\n",
-        "    )\n",
-        "\n",
-        "    print(endpoint.display_name)\n",
-        "    print(endpoint.resource_name)\n",
-        "    return endpoint"
-      ]
-    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -938,17 +915,16 @@
       },
       "outputs": [],
       "source": [
-        "endpoint_name = f\"{BQML_MODEL_NAME}-{TIMESTAMP}\"\n",
+        "ENDPOINT_NAME = f\"{BQML_MODEL_NAME}-endpoint\"\n",
         "\n",
-        "print(\n",
-        "    f\"\"\"\n",
-        "PROJECT_ID: {PROJECT_ID},\n",
-        "endpoint_name: {endpoint_name}\n",
-        "REGION: {REGION}\n",
-        "\"\"\"\n",
+        "endpoint = vertex_ai.Endpoint.create(\n",
+        "    display_name=ENDPOINT_NAME,\n",
+        "    project=PROJECT_ID,\n",
+        "    location=REGION,\n",
         ")\n",
         "\n",
-        "create_endpoint(PROJECT_ID, endpoint_name, REGION)"
+        "print(endpoint.display_name)\n",
+        "print(endpoint.resource_name)"
       ]
     },
     {
@@ -966,31 +942,7 @@
         "id": "951ed1693f6b"
       },
       "source": [
-        "List the endpoints to make sure it has successfully been created. You can also view your endpoints on the [Vertex AI Endpoints page](https://console.cloud.google.com/vertex-ai/endpoints?project=polong-contentdev)."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "0a9bad8d9ad4"
-      },
-      "outputs": [],
-      "source": [
-        "endpoint = vertex_ai.Endpoint.list(\n",
-        "    # filter=f'display_name={endpoint_name}', # optional: filter by specific endpoint name\n",
-        "    order_by=\"update_time\"\n",
-        ")\n",
-        "endpoint[-1]"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "2431a4d28d97"
-      },
-      "source": [
-        "Retrieve the endpoint id so you can use it in the next step."
+        "List the endpoints to make sure it has successfully been created. (You can also view your endpoints on the <a href=\"https://console.cloud.google.com/vertex-ai/endpoints\" target=\"_blank\">Vertex AI Endpoints page</a>)."
       ]
     },
     {
@@ -1001,7 +953,7 @@
       },
       "outputs": [],
       "source": [
-        "endpoint[-1].to_dict()"
+        "endpoint.list()"
       ]
     },
     {
@@ -1019,74 +971,19 @@
         "id": "6a90be5b77a2"
       },
       "source": [
-        "With the model, you can now deploy it to an endpoint. "
+        "With the new endpoint, you can now deploy your model."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "af323ea42c5b"
-      },
-      "outputs": [],
-      "source": [
-        "from typing import Dict, Optional, Sequence, Tuple\n",
-        "\n",
-        "\n",
-        "def deploy_model_with_automatic_resources_sample(\n",
-        "    project,\n",
-        "    location,\n",
-        "    model_name: str,\n",
-        "    endpoint: Optional[vertex_ai.Endpoint] = None,\n",
-        "    deployed_model_display_name: Optional[str] = None,\n",
-        "    traffic_percentage: Optional[int] = 0,\n",
-        "    traffic_split: Optional[Dict[str, int]] = None,\n",
-        "    min_replica_count: int = 1,\n",
-        "    max_replica_count: int = 1,\n",
-        "    metadata: Optional[Sequence[Tuple[str, str]]] = (),\n",
-        "    sync: bool = True,\n",
-        "):\n",
-        "    \"\"\"\n",
-        "    model_name: A fully-qualified model resource name or model ID.\n",
-        "          Example: \"projects/123/locations/us-central1/models/456\" or\n",
-        "          \"456\" when project and location are initialized or passed.\n",
-        "    \"\"\"\n",
-        "\n",
-        "    model = vertex_ai.Model(model_name=model_name)\n",
-        "\n",
-        "    model.deploy(\n",
-        "        endpoint=endpoint,\n",
-        "        deployed_model_display_name=deployed_model_display_name,\n",
-        "        traffic_percentage=traffic_percentage,\n",
-        "        traffic_split=traffic_split,\n",
-        "        min_replica_count=min_replica_count,\n",
-        "        max_replica_count=max_replica_count,\n",
-        "        metadata=metadata,\n",
-        "        sync=sync,\n",
-        "    )\n",
-        "\n",
-        "    model.wait()\n",
-        "\n",
-        "    print(model.display_name)\n",
-        "    print(model.resource_name)\n",
-        "    return"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "9e6763369af4"
+        "id": "c70ecc568ee5"
       },
       "outputs": [],
       "source": [
         "# deploying the model to the endpoint may take 10-15 minutes\n",
-        "deploy_model_with_automatic_resources_sample(\n",
-        "    project=PROJECT_ID,\n",
-        "    location=REGION,\n",
-        "    model_name=BQML_MODEL_NAME,\n",
-        "    endpoint=endpoint[-1],\n",
-        ")"
+        "model.deploy(endpoint=endpoint)"
       ]
     },
     {
@@ -1095,7 +992,7 @@
         "id": "c303d779477b"
       },
       "source": [
-        "You can also check on the status of your model by visiting the [Vertex AI Endpoints page](https://console.cloud.google.com/vertex-ai/endpoints)."
+        "You can also check on the status of your model by visiting the <a href=\"https://console.cloud.google.com/vertex-ai/endpoints\" target=\"_blank\">Vertex AI Endpoints page</a>."
       ]
     },
     {
@@ -1168,35 +1065,12 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "2c6093ce9f8a"
+        "id": "b4839f31d2f8"
       },
       "outputs": [],
       "source": [
-        "def endpoint_predict_sample(\n",
-        "    project: str, location: str, instances: list, endpoint: str\n",
-        "):\n",
-        "    endpoint = vertex_ai.Endpoint(endpoint)\n",
-        "\n",
-        "    prediction = endpoint.predict(instances=instances)\n",
-        "    return prediction"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "0c41fd6eeb6f"
-      },
-      "outputs": [],
-      "source": [
-        "prediction_response = endpoint_predict_sample(\n",
-        "    project=PROJECT_ID,\n",
-        "    location=REGION,\n",
-        "    instances=df_sample_requests_list,\n",
-        "    endpoint=endpoint[-1].name,\n",
-        ")\n",
-        "\n",
-        "prediction_response"
+        "prediction = endpoint.predict(df_sample_requests_list)\n",
+        "print(prediction)"
       ]
     },
     {
@@ -1216,7 +1090,7 @@
       },
       "outputs": [],
       "source": [
-        "prediction_response.predictions"
+        "prediction.predictions"
       ]
     },
     {
@@ -1227,8 +1101,8 @@
       "source": [
         "## Cleaning up\n",
         "\n",
-        "To clean up all Google Cloud resources used in this project, you can [delete the Google Cloud\n",
-        "project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#shutting_down_projects) you used for the tutorial.\n",
+        "To clean up all Google Cloud resources used in this project, you can <a href=\"https://cloud.google.com/resource-manager/docs/creating-managing-projects#shutting_down_projects\" target=\"_blank\">delete the Google Cloud\n",
+        "project</a> you used for the tutorial.\n",
         "\n",
         "Otherwise, you can delete the individual resources you created in this tutorial:"
       ]
@@ -1241,18 +1115,12 @@
       },
       "outputs": [],
       "source": [
-        "# MODEL_ID = model.name\n",
+        "# Undeploy model from endpoint and delete endpoint\n",
+        "endpoint.undeploy_all()\n",
+        "endpoint.delete()\n",
         "\n",
-        "ENDPOINT_ID = int(endpoint[-1].name)\n",
-        "\n",
-        "# Undeploy model from endpoint\n",
-        "endpoint[-1].undeploy_all()\n",
-        "\n",
-        "# Delete endpoint resource\n",
-        "! gcloud ai endpoints delete $ENDPOINT_ID --quiet --region $REGION\n",
-        "\n",
-        "# Delete BigQuery ML model\n",
-        "! bq rm -f --model $PROJECT_ID\\:$BQ_DATASET_NAME\\.$BQML_MODEL_NAME"
+        "# Delete BigQuery dataset, including the BigQuery ML model\n",
+        "! bq rm -r -f $PROJECT_ID:$BQ_DATASET_NAME"
       ]
     }
   ],

notebooks/official/custom/SDK_Custom_Container_Prediction.ipynb

@@ -29,12 +29,23 @@
         "id": "JAPoU8Sm5E6e"
       },
       "source": [
+        "# Deploying Iris-detection model using FastAPI and Vertex AI custom container serving\n",
+        "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/community/sdk/SDK_Custom_Container_Prediction.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/custom/SDK_Custom_Container_Prediction.ipynb\">\n",
+        "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
+        "    </a>\n",
+        "  </td>\n",
+        "  <td>\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/custom/SDK_Custom_Container_Prediction.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/custom/SDK_Custom_Container_Prediction.ipynb\">\n",
+        "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
+        "      Open in Vertex AI Workbench\n",
+        "    </a>\n",
         "  </td>\n",
         "</table>"
       ]
@@ -47,38 +58,67 @@
       "source": [
         "## Overview\n",
         "\n",
-        "This tutorial walks through building a custom container to serve a scikit-learn model on Vertex Predictions. You will use the FastAPI Python web server framework to create a prediction and health endpoint.\n",
-        "You will also cover incorporating a pre-processor from training into your online serving.\n",
+        "This tutorial walks you through building a custom container to serve a scikit-learn model on Vertex AI. You use the FastAPI Python web server framework to create a prediction and health endpoint. You also incorporate a pre-processor from training pipeline into your online serving application."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "cbd99f7bfc8e"
+      },
+      "source": [
+        "### Objective\n",
+        "\n",
+        "The objective of this notebook is to create, deploy and serve a custom classification model on Vertex AI. This notebook focuses more on deploying the model than on the design of the model itself. \n",
         "\n",
         "\n",
+        "This tutorial uses the following Google Cloud ML services and resources:\n",
+        "\n",
+        "- Vertex AI Models\n",
+        "- Vertex AI Endpoints\n",
+        "\n",
+        "The steps performed include:\n",
+        "\n",
+        "- Train a model that uses flower's measurements as input to predict the class of iris.\n",
+        "- Save the model and its serialized pre-processor.\n",
+        "- Build a FastAPI server to handle predictions and health checks.\n",
+        "- Build a custom container with model artifacts.\n",
+        "- Upload and deploy custom container to Vertex AI Endpoints."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "0fe0bb78c9ce"
+      },
+      "source": [
         "### Dataset\n",
         "\n",
-        "This tutorial uses R.A. Fisher's Iris dataset, a small dataset that is popular for trying out machine learning techniques. Each instance has four numerical features, which are different measurements of a flower, and a target label that\n",
+        "This tutorial uses R.A. Fisher's Iris dataset, a small dataset that is a popular choice for trying out machine learning techniques. Each instance has four numerical features, which are different measurements of a flower, and a target label that\n",
         "marks it as one of three types of iris: Iris setosa, Iris versicolour, or Iris virginica.\n",
         "\n",
         "This tutorial uses [the copy of the Iris dataset included in the\n",
-        "scikit-learn library](https://scikit-learn.org/stable/datasets/index.html#iris-dataset).\n",
-        "\n",
-        "### Objective\n",
-        "\n",
-        "The goal is to:\n",
-        "- Train a model that uses a flower's measurements as input to predict what type of iris it is.\n",
-        "- Save the model and its serialized pre-processor\n",
-        "- Build a FastAPI server to handle predictions and health checks\n",
-        "- Build a custom container with model artifacts\n",
-        "- Upload and deploy custom container to Vertex Prediction\n",
-        "\n",
-        "This tutorial focuses more on deploying this model with Vertex AI than on\n",
-        "the design of the model itself.\n",
-        "\n",
+        "scikit-learn library](https://scikit-learn.org/stable/modules/generated/sklearn.datasets.load_iris.html#sklearn.datasets.load_iris)."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "c681f532cf64"
+      },
+      "source": [
         "### Costs \n",
         "\n",
         "This tutorial uses billable components of Google Cloud:\n",
         "\n",
         "* Vertex AI\n",
+        "* Cloud Storage\n",
+        "* Artifact Registry\n",
+        "* Cloud Build\n",
         "\n",
         "Learn about [Vertex AI\n",
-        "pricing](https://cloud.google.com/vertex-ai/pricing), and use the [Pricing\n",
+        "pricing](https://cloud.google.com/vertex-ai/pricing), [Cloud Storage\n",
+        "pricing](https://cloud.google.com/storage/pricing), [Artifact Registry pricing](https://cloud.google.com/artifact-registry/pricing) and [Cloud Build pricing](https://cloud.google.com/build/pricing) and use the [Pricing\n",
         "Calculator](https://cloud.google.com/products/calculator/)\n",
         "to generate a cost estimate based on your projected usage."
       ]
@@ -91,8 +131,10 @@
       "source": [
         "### Set up your local development environment\n",
         "\n",
-        "**If you are using Colab or Google Cloud Notebooks**, your environment already meets\n",
-        "all the requirements to run this notebook. You can skip this step."
+        "**If you are using Colab or Vertex AI Workbench notebooks**, your environment already meets\n",
+        "all the requirements to run this notebook.\n",
+        "\n",
+        "**If you are using Colab**, docker related steps are skipped as Colab doesn't fully support docker yet."
       ]
     },
     {
@@ -139,7 +181,7 @@
         "id": "i7EUnXsZhAGF"
       },
       "source": [
-        "### Install additional packages\n",
+        "## Install additional packages\n",
         "\n",
         "Install additional package dependencies not installed in your notebook environment, such as NumPy, Scikit-learn, FastAPI, Uvicorn, and joblib. Use the latest major GA version of each package."
       ]
@@ -163,18 +205,31 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "wyy5Lbnzg5fi"
+        "id": "1fd00fa70a2a"
       },
       "outputs": [],
       "source": [
+        "import os\n",
+        "\n",
+        "# The Vertex AI Workbench Notebook product has specific requirements\n",
+        "IS_WORKBENCH_NOTEBOOK = os.getenv(\"DL_ANACONDA_HOME\")\n",
+        "IS_USER_MANAGED_WORKBENCH_NOTEBOOK = os.path.exists(\n",
+        "    \"/opt/deeplearning/metadata/env_version\"\n",
+        ")\n",
+        "\n",
+        "# Vertex AI Notebook requires dependencies to be installed with '--user'\n",
+        "USER_FLAG = \"\"\n",
+        "if IS_WORKBENCH_NOTEBOOK:\n",
+        "    USER_FLAG = \"--user\"\n",
+        "\n",
         "# Required in Docker serving container\n",
-        "%pip install -U --user -r requirements.txt\n",
+        "! pip3 install -U {USER_FLAG} -r requirements.txt -q\n",
         "\n",
         "# For local FastAPI development and running\n",
-        "%pip install -U --user \"uvicorn[standard]>=0.12.0,<0.14.0\" fastapi~=0.63\n",
+        "! pip3 install -U {USER_FLAG} \"uvicorn[standard]>=0.12.0,<0.14.0\" fastapi~=0.63 -q\n",
         "\n",
         "# Vertex SDK for Python\n",
-        "%pip install -U --user google-cloud-aiplatform"
+        "! pip3 install -U {USER_FLAG} google-cloud-aiplatform -q"
       ]
     },
     {
@@ -230,14 +285,14 @@
         "\n",
         "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
         "\n",
-        "1. [Enable the Vertex AI API and Compute Engine API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component).\n",
+        "1. [Enable the APIs for Vertex AI, Compute Engine and Artifact Registry](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute.googleapis.com,artifactregistry.googleapis.com).\n",
         "\n",
-        "1. If you are running this notebook locally, you will need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
+        "1. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
         "\n",
         "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
         "Cloud SDK uses the right project for all the commands in this notebook.\n",
         "\n",
-        "**Note**: Jupyter runs lines prefixed with `!` or `%` as shell commands, and it interpolates Python variables with `$` or `{}` into these commands."
+        "**Note**: Jupyter runs lines prefixed with `!` as shell commands, and it interpolates Python variables prefixed with `$` into these commands."
       ]
     },
     {
@@ -251,6 +306,17 @@
         "**If you don't know your project ID**, you may be able to get your project ID using `gcloud`."
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "cde8e0876d62"
+      },
+      "outputs": [],
+      "source": [
+        "PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}"
+      ]
+    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -259,24 +325,11 @@
       },
       "outputs": [],
       "source": [
-        "# Get your Google Cloud project ID from gcloud\n",
-        "shell_output=!gcloud config list --format 'value(core.project)' 2>/dev/null\n",
-        "\n",
-        "try:\n",
+        "if PROJECT_ID == \"\" or PROJECT_ID is None or PROJECT_ID == \"[your-project-id]\":\n",
+        "    # Get your GCP project id from gcloud\n",
+        "    shell_output = ! gcloud config list --format 'value(core.project)' 2>/dev/null\n",
         "    PROJECT_ID = shell_output[0]\n",
-        "except IndexError:\n",
-        "    PROJECT_ID = None\n",
-        "\n",
-        "print(\"Project ID:\", PROJECT_ID)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "qJYoRfYng0XZ"
-      },
-      "source": [
-        "Otherwise, set your project ID here."
+        "    print(\"Project ID:\", PROJECT_ID)"
       ]
     },
     {
@@ -287,28 +340,85 @@
       },
       "outputs": [],
       "source": [
-        "if PROJECT_ID == \"\" or PROJECT_ID is None:\n",
-        "    PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}"
+        "! gcloud config set project $PROJECT_ID"
       ]
     },
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "dr--iN2kAylZ"
+        "id": "becb6514d26a"
+      },
+      "source": [
+        "#### Region\n",
+        "\n",
+        "You can also change the `REGION` variable, which is used for operations\n",
+        "throughout the rest of this notebook.  Below are regions supported for Vertex AI. It is recommended that you choose the region closest to you.\n",
+        "\n",
+        "- Americas: `us-central1`\n",
+        "- Europe: `europe-west4`\n",
+        "- Asia Pacific: `asia-east1`\n",
+        "\n",
+        "You may not use a multi-regional bucket for training with Vertex AI. Not all regions provide support for all Vertex AI services.\n",
+        "\n",
+        "Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations)."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "959545da671a"
+      },
+      "outputs": [],
+      "source": [
+        "REGION = \"[your-region]\"  # @param {type: \"string\"}\n",
+        "\n",
+        "if REGION == \"[your-region]\":\n",
+        "    REGION = \"us-central1\""
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "e663bd062c6f"
+      },
+      "source": [
+        "#### UUID\n",
+        "\n",
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "953fa6e5ddda"
+      },
+      "outputs": [],
+      "source": [
+        "import random\n",
+        "import string\n",
+        "\n",
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "40206eb20b53"
       },
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Google Cloud Notebooks**, your environment is already\n",
-        "authenticated. Skip this step."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "sBCra4QMA2wR"
-      },
-      "source": [
+        "**If you are using Vertex AI Workbench notebooks**, your environment is already\n",
+        "authenticated.\n",
+        "\n",
         "**If you are using Colab**, run the cell below and follow the instructions\n",
         "when prompted to authenticate your account via oAuth.\n",
         "\n",
@@ -337,20 +447,23 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "PyQmSRbKA8r-"
+        "id": "4dd67f16eff2"
       },
       "outputs": [],
       "source": [
-        "import os\n",
-        "import sys\n",
-        "\n",
         "# If you are running this notebook in Colab, run this cell and follow the\n",
         "# instructions to authenticate your GCP account. This provides access to your\n",
         "# Cloud Storage bucket and lets you submit training jobs and prediction\n",
         "# requests.\n",
         "\n",
-        "# If on Google Cloud Notebooks, then don't execute this code\n",
-        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\"):\n",
+        "import os\n",
+        "import sys\n",
+        "\n",
+        "# If on Vertex AI Workbench, then don't execute this code\n",
+        "IS_COLAB = \"google.colab\" in sys.modules\n",
+        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\") and not os.getenv(\n",
+        "    \"DL_ANACONDA_HOME\"\n",
+        "):\n",
         "    if \"google.colab\" in sys.modules:\n",
         "        from google.colab import auth as google_auth\n",
         "\n",
@@ -359,57 +472,10 @@
         "    # If you are running this notebook locally, replace the string below with the\n",
         "    # path to your service account key and run this cell to authenticate your GCP\n",
         "    # account.\n",
-        "    elif not os.getenv(\"IS_TESTING\") and not os.getenv(\n",
-        "        \"GOOGLE_APPLICATION_CREDENTIALS\"\n",
-        "    ):\n",
+        "    elif not os.getenv(\"IS_TESTING\"):\n",
         "        %env GOOGLE_APPLICATION_CREDENTIALS ''"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "XoEqT2Y4DJmf"
-      },
-      "source": [
-        "### Configure project and resource names"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "MzGDU7TWdts_"
-      },
-      "outputs": [],
-      "source": [
-        "REGION = \"us-central1\"  # @param {type:\"string\"}\n",
-        "MODEL_ARTIFACT_DIR = \"custom-container-prediction-model\"  # @param {type:\"string\"}\n",
-        "REPOSITORY = \"custom-container-prediction\"  # @param {type:\"string\"}\n",
-        "IMAGE = \"sklearn-fastapi-server\"  # @param {type:\"string\"}\n",
-        "MODEL_DISPLAY_NAME = \"sklearn-custom-container\"  # @param {type:\"string\"}"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "ca1a915d641d"
-      },
-      "source": [
-        "`REGION` - Used for operations\n",
-        "throughout the rest of this notebook. Make sure to [choose a region where Cloud\n",
-        "Vertex AI services are\n",
-        "available](https://cloud.google.com/vertex-ai/docs/general/locations#feature-availability). You may\n",
-        "not use a Multi-Regional Storage bucket for training with Vertex AI.\n",
-        "\n",
-        "`MODEL_ARTIFACT_DIR` - Folder directory path to your model artifacts within a Cloud Storage bucket, for example: \"my-models/fraud-detection/trial-4\"\n",
-        "\n",
-        "`REPOSITORY` - Name of the Artifact Repository to create or use.\n",
-        "\n",
-        "`IMAGE` - Name of the container image that will be pushed.\n",
-        "\n",
-        "`MODEL_DISPLAY_NAME` - Display name of Vertex AI Model resource."
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -420,8 +486,8 @@
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "To update your model artifacts without re-building the container, you must upload your model\n",
-        "artifacts and any custom code to Cloud Storage.\n",
+        "To update your model artifacts without re-building the container, you upload your model\n",
+        "artifacts and any custom code to Cloud Storage bucket.\n",
         "\n",
         "Set the name of your Cloud Storage bucket below. It must be unique across all\n",
         "Cloud Storage buckets. "
@@ -435,7 +501,21 @@
       },
       "outputs": [],
       "source": [
-        "BUCKET_NAME = \"gs://[your-bucket-name]\"  # @param {type:\"string\"}"
+        "BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}\n",
+        "BUCKET_URI = f\"gs://{BUCKET_NAME}\""
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "db3de5b7b0a4"
+      },
+      "outputs": [],
+      "source": [
+        "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
+        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + UUID\n",
+        "    BUCKET_URI = f\"gs://{BUCKET_NAME}\""
       ]
     },
     {
@@ -455,7 +535,7 @@
       },
       "outputs": [],
       "source": [
-        "! gsutil mb -l $REGION $BUCKET_NAME"
+        "! gsutil mb -l $REGION $BUCKET_URI"
       ]
     },
     {
@@ -475,7 +555,95 @@
       },
       "outputs": [],
       "source": [
-        "! gsutil ls -al $BUCKET_NAME"
+        "! gsutil ls -al $BUCKET_URI"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "d3938f6d37a1"
+      },
+      "source": [
+        "## Import libraries"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "e95ca1e5e07c"
+      },
+      "outputs": [],
+      "source": [
+        "from google.cloud import aiplatform"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "750d53e37094"
+      },
+      "source": [
+        "### Initialize Vertex AI SDK for Python\n",
+        "\n",
+        "Initialize the Vertex AI SDK for Python for your project and corresponding bucket."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "1a3aa2d4a74f"
+      },
+      "outputs": [],
+      "source": [
+        "aiplatform.init(project=PROJECT_ID, location=REGION)"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "XoEqT2Y4DJmf"
+      },
+      "source": [
+        "### Configure resource names\n",
+        "\n",
+        "Set a name for the following resources:\n",
+        "\n",
+        "`MODEL_ARTIFACT_DIR` - Folder directory path to your model artifacts within a Cloud Storage bucket, for example: \"my-models/fraud-detection/trial-4\"\n",
+        "\n",
+        "`REPOSITORY` - Name of the Artifact Repository to create or use.\n",
+        "\n",
+        "`IMAGE` - Name of the container image that is pushed to the repository.\n",
+        "\n",
+        "`MODEL_DISPLAY_NAME` - Display name of Vertex AI Model resource."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "MzGDU7TWdts_"
+      },
+      "outputs": [],
+      "source": [
+        "MODEL_ARTIFACT_DIR = \"[your-artifact-directory]\"  # @param {type:\"string\"}\n",
+        "REPOSITORY = \"[your-repository-name]\"  # @param {type:\"string\"}\n",
+        "IMAGE = \"[your-image-name]\"  # @param {type:\"string\"}\n",
+        "MODEL_DISPLAY_NAME = \"[your-model-display-name]\"  # @param {type:\"string\"}\n",
+        "\n",
+        "# Set the defaults if no names were specified\n",
+        "if MODEL_ARTIFACT_DIR == \"[your-artifact-directory]\":\n",
+        "    MODEL_ARTIFACT_DIR = \"custom-container-prediction-model\"\n",
+        "\n",
+        "if REPOSITORY == \"[your-repository-name]\":\n",
+        "    REPOSITORY = \"custom-container-prediction\"\n",
+        "\n",
+        "if IMAGE == \"[your-image-name]\":\n",
+        "    IMAGE = \"sklearn-fastapi-server\"\n",
+        "\n",
+        "if MODEL_DISPLAY_NAME == \"[your-model-display-name]\":\n",
+        "    MODEL_DISPLAY_NAME = \"sklearn-custom-container\""
       ]
     },
     {
@@ -485,9 +653,9 @@
       },
       "source": [
         "## Write your pre-processor\n",
-        "Scaling training data so each numerical feature column has a mean of 0 and a standard deviation of 1 [can improve your model](https://developers.google.com/machine-learning/crash-course/representation/cleaning-data).\n",
+        "Standardize the training data so each numerical feature column has a mean of 0 and a standard deviation of 1 [can improve your model](https://developers.google.com/machine-learning/crash-course/representation/cleaning-data).\n",
         "\n",
-        "Create `preprocess.py`, which contains a class to do this scaling:"
+        "Define a `app` folder and create `preprocess.py`, which contains a class to perform standardization."
       ]
     },
     {
@@ -538,7 +706,7 @@
         "## Train and store model with pre-processor\n",
         "Next, use `preprocess.MySimpleScaler` to preprocess the iris data, then train a model using scikit-learn.\n",
         "\n",
-        "At the end, export your trained model as a joblib (`.joblib`) file and export your `MySimpleScaler` instance as a pickle (`.pkl`) file:"
+        "At the end, export your trained model as a joblib (`.joblib`) file and export your `MySimpleScaler` instance as a pickle (`.pkl`) file."
       ]
     },
     {
@@ -596,7 +764,7 @@
       },
       "outputs": [],
       "source": [
-        "!gsutil cp model.joblib preprocessor.pkl {BUCKET_NAME}/{MODEL_ARTIFACT_DIR}/\n",
+        "!gsutil cp model.joblib preprocessor.pkl {BUCKET_URI}/{MODEL_ARTIFACT_DIR}/\n",
         "%cd .."
       ]
     },
@@ -606,7 +774,9 @@
         "id": "480a1d88ecdb"
       },
       "source": [
-        "## Build a FastAPI server"
+        "## Build a FastAPI server\n",
+        "\n",
+        "To serve predictions from the classification model, build a FastAPI server application."
       ]
     },
     {
@@ -674,7 +844,7 @@
       },
       "source": [
         "### Add pre-start script\n",
-        "FastAPI will execute this script before starting up the server. The `PORT` environment variable is set to equal `AIP_HTTP_PORT` in order to run FastAPI on same the port expected by Vertex AI."
+        "FastAPI executes the following script before starting up the server. The `PORT` environment variable is set to equal to `AIP_HTTP_PORT` in order to run FastAPI on the same port expected by Vertex AI."
       ]
     },
     {
@@ -696,7 +866,7 @@
         "id": "8b62ddf1def3"
       },
       "source": [
-        "### Store test instances to use later\n",
+        "### Create test instances\n",
         "To learn more about formatting input instances in JSON, [read the documentation.](https://cloud.google.com/vertex-ai/docs/predictions/online-predictions-custom-models#request-body-details)"
       ]
     },
@@ -726,35 +896,13 @@
         "## Build and push container to Artifact Registry"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "3bdb9a7768a5"
-      },
-      "source": [
-        "### Build your container\n",
-        "Optionally copy in your credentials to run the container locally."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "fbb77f4f56c7"
-      },
-      "outputs": [],
-      "source": [
-        "# NOTE: Copy in credentials to run locally, this step can be skipped for deployment\n",
-        "%cp $GOOGLE_APPLICATION_CREDENTIALS app/credentials.json"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
         "id": "240578ec9efe"
       },
       "source": [
-        "Write the Dockerfile, using `tiangolo/uvicorn-gunicorn-fastapi` as a base image. This will automatically run FastAPI for you using Gunicorn and Uvicorn. Visit [the FastAPI docs to read more about deploying FastAPI with Docker](https://fastapi.tiangolo.com/deployment/docker/)."
+        "Write the `Dockerfile`, using `tiangolo/uvicorn-gunicorn-fastapi` as a base image. This automatically runs FastAPI for you using Gunicorn and Uvicorn. Visit [the FastAPI docs to read more about deploying FastAPI with Docker](https://fastapi.tiangolo.com/deployment/docker/) to learn more."
       ]
     },
     {
@@ -767,7 +915,7 @@
       "source": [
         "%%writefile Dockerfile\n",
         "\n",
-        "FROM tiangolo/uvicorn-gunicorn-fastapi:python3.7\n",
+        "FROM tiangolo/uvicorn-gunicorn-fastapi:python3.9\n",
         "\n",
         "COPY ./app /app\n",
         "COPY requirements.txt requirements.txt\n",
@@ -781,7 +929,11 @@
         "id": "04c988201499"
       },
       "source": [
-        "Build the image and tag the Artifact Registry path that you will push to."
+        "### Build the image locally (optional)\n",
+        "\n",
+        "Build the image using docker to test it locally.\n",
+        "\n",
+        "**Note:** Docker is only being used to test the container locally. For deployment to Artifact registry, Cloud-Build is used."
       ]
     },
     {
@@ -792,9 +944,10 @@
       },
       "outputs": [],
       "source": [
-        "!docker build \\\n",
-        "    --tag={REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE} \\\n",
-        "    ."
+        "if not IS_COLAB and not os.getenv(\"IS_TESTING\"):\n",
+        "    ! sudo docker build \\\n",
+        "            --tag=\"{REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}\" \\\n",
+        "            ."
       ]
     },
     {
@@ -805,7 +958,7 @@
       "source": [
         "### Run and test the container locally (optional)\n",
         "\n",
-        "Run the container locally in detached mode and provide the environment variables that the container requires. These env vars will be provided to the container by Vertex Prediction once deployed. Test the `/health` and `/predict` routes, then stop the running image."
+        "Test running the container locally in detached mode and provide the environment variables that the container requires. These variables are provided to the container by Vertex AI once deployed. Test the `/health` and `/predict` routes and then stop the running image."
       ]
     },
     {
@@ -816,15 +969,25 @@
       },
       "outputs": [],
       "source": [
-        "!docker rm local-iris\n",
-        "!docker run -d -p 80:8080 \\\n",
-        "    --name=local-iris \\\n",
-        "    -e AIP_HTTP_PORT=8080 \\\n",
-        "    -e AIP_HEALTH_ROUTE=/health \\\n",
-        "    -e AIP_PREDICT_ROUTE=/predict \\\n",
-        "    -e AIP_STORAGE_URI={BUCKET_NAME}/{MODEL_ARTIFACT_DIR} \\\n",
-        "    -e GOOGLE_APPLICATION_CREDENTIALS=credentials.json \\\n",
-        "    {REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}"
+        "if not IS_COLAB and not os.getenv(\"IS_TESTING\"):\n",
+        "    ! sudo docker stop local-iris\n",
+        "    ! sudo docker rm local-iris\n",
+        "    ! sudo docker run -d -p 80:8080 \\\n",
+        "            --name=local-iris \\\n",
+        "            -e AIP_HTTP_PORT=8080 \\\n",
+        "            -e AIP_HEALTH_ROUTE=/health \\\n",
+        "            -e AIP_PREDICT_ROUTE=/predict \\\n",
+        "            -e AIP_STORAGE_URI={BUCKET_URI}/{MODEL_ARTIFACT_DIR} \\\n",
+        "            \"{REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}\""
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "248f481e8e90"
+      },
+      "source": [
+        "Ping the health route."
       ]
     },
     {
@@ -835,7 +998,17 @@
       },
       "outputs": [],
       "source": [
-        "!curl localhost/health"
+        "if not IS_COLAB and not os.getenv(\"IS_TESTING\"):\n",
+        "    ! curl localhost/health"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "2d6821fb2b7d"
+      },
+      "source": [
+        "Pass the `instances.json` and test the predict route."
       ]
     },
     {
@@ -846,10 +1019,20 @@
       },
       "outputs": [],
       "source": [
-        "!curl -X POST \\\n",
-        "  -d @instances.json \\\n",
-        "  -H \"Content-Type: application/json; charset=utf-8\" \\\n",
-        "  localhost/predict"
+        "if not IS_COLAB and not os.getenv(\"IS_TESTING\"):\n",
+        "    ! curl -X POST \\\n",
+        "      -d @instances.json \\\n",
+        "      -H \"Content-Type: application/json; charset=utf-8\" \\\n",
+        "      localhost/predict"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "d1d6ee697180"
+      },
+      "source": [
+        "Stop and delete the container locally."
       ]
     },
     {
@@ -860,7 +1043,9 @@
       },
       "outputs": [],
       "source": [
-        "!docker stop local-iris"
+        "if not IS_COLAB and not os.getenv(\"IS_TESTING\"):\n",
+        "    ! sudo docker stop local-iris\n",
+        "    ! sudo docker rm local-iris"
       ]
     },
     {
@@ -871,31 +1056,32 @@
       "source": [
         "### Push the container to artifact registry\n",
         "\n",
-        "Configure Docker to access Artifact Registry. Then push your container image to your Artifact Registry repository."
+        "Create your repository in the Artifact registry and push your container image to the repository.\n",
+        "Run this below cell once to create the artifact repository."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "09ffe2434e3d"
+        "id": "5f98a42332e5"
       },
       "outputs": [],
       "source": [
-        "!gcloud beta artifacts repositories create {REPOSITORY} \\\n",
+        "!gcloud artifacts repositories create {REPOSITORY} \\\n",
         "    --repository-format=docker \\\n",
         "    --location=$REGION"
       ]
     },
     {
-      "cell_type": "code",
-      "execution_count": null,
+      "cell_type": "markdown",
       "metadata": {
-        "id": "293437024749"
+        "id": "d2e0b8b700aa"
       },
-      "outputs": [],
       "source": [
-        "!gcloud auth configure-docker {REGION}-docker.pkg.dev"
+        "Push the image to the created artifact repository using Cloud-Build.\n",
+        "\n",
+        "**Note:** The following command automatically considers the Dockerfile from the directory it is being run from."
       ]
     },
     {
@@ -906,7 +1092,7 @@
       },
       "outputs": [],
       "source": [
-        "!docker push {REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}"
+        "!gcloud builds submit --region={REGION} --tag={REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}"
       ]
     },
     {
@@ -915,9 +1101,7 @@
         "id": "b438bfa2129f"
       },
       "source": [
-        "## Deploy to Vertex AI\n",
-        "\n",
-        "Use the Python SDK to upload and deploy your model."
+        "## Deploy to Vertex AI"
       ]
     },
     {
@@ -926,29 +1110,8 @@
         "id": "4ae19df6a33e"
       },
       "source": [
-        "### Upload the custom container model"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "8d682d8388ec"
-      },
-      "outputs": [],
-      "source": [
-        "from google.cloud import aiplatform"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "574fb82d3eed"
-      },
-      "outputs": [],
-      "source": [
-        "aiplatform.init(project=PROJECT, location=REGION)"
+        "### Create Vertex AI model using artifact uri\n",
+        "Use the Python SDK to upload and deploy your model from the artifact registry."
       ]
     },
     {
@@ -961,7 +1124,7 @@
       "source": [
         "model = aiplatform.Model.upload(\n",
         "    display_name=MODEL_DISPLAY_NAME,\n",
-        "    artifact_uri=f\"{BUCKET_NAME}/{MODEL_ARTIFACT_DIR}\",\n",
+        "    artifact_uri=f\"{BUCKET_URI}/{MODEL_ARTIFACT_DIR}\",\n",
         "    serving_container_image_uri=f\"{REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}\",\n",
         ")"
       ]
@@ -972,8 +1135,9 @@
         "id": "bd1b85afc7df"
       },
       "source": [
-        "### Deploy the model on Vertex AI\n",
-        "After this step completes, the model is deployed and ready for online prediction."
+        "### Deploy the model to Vertex AI Endpoints\n",
+        "\n",
+        "Deploy the model to a Vertex AI Endpoint. After this step completes, the model is deployed and ready for online predictions."
       ]
     },
     {
@@ -993,9 +1157,13 @@
         "id": "6883e7b07143"
       },
       "source": [
-        "## Send predictions\n",
+        "## Request predictions\n",
         "\n",
-        "### Using Python SDK"
+        "Send online requests to the model deployed to the endpoint and get predictions.\n",
+        "\n",
+        "### Using Python SDK\n",
+        "\n",
+        "Get predictions from the endpoint for a sample input using python SDK."
       ]
     },
     {
@@ -1015,7 +1183,9 @@
         "id": "370d22f53427"
       },
       "source": [
-        "### Using REST"
+        "### Using REST\n",
+        "\n",
+        "Get predictions from the endpoint using curl request."
       ]
     },
     {
@@ -1050,7 +1220,9 @@
         "id": "fa71174a7dd0"
       },
       "source": [
-        "### Using gcloud CLI"
+        "### Using gcloud CLI\n",
+        "\n",
+        "Get predictions from the endpoint using gcloud CLI."
       ]
     },
     {
@@ -1061,7 +1233,7 @@
       },
       "outputs": [],
       "source": [
-        "!gcloud beta ai endpoints predict $ENDPOINT_ID \\\n",
+        "!gcloud ai endpoints predict $ENDPOINT_ID \\\n",
         "  --region=$REGION \\\n",
         "  --json-request=instances.json"
       ]
@@ -1077,7 +1249,13 @@
         "To clean up all Google Cloud resources used in this project, you can [delete the Google Cloud\n",
         "project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#shutting_down_projects) you used for the tutorial.\n",
         "\n",
-        "Otherwise, you can delete the individual resources you created in this tutorial:"
+        "Otherwise, you can delete the individual resources you created in this tutorial:\n",
+        "\n",
+        "- Model\n",
+        "- Endpoint\n",
+        "- Artifact Registry Image\n",
+        "- Artifact Repository: Set `delete_art_repo` to **True** to delete the repository created in this tutorial.\n",
+        "- Cloud Storage bucket: Set `delete_bucket` to **True** to delete the Cloud Storage bucket used in this tutorial."
       ]
     },
     {
@@ -1088,24 +1266,36 @@
       },
       "outputs": [],
       "source": [
+        "delete_bucket = False\n",
+        "delete_art_repo = False\n",
+        "    \n",
         "# Undeploy model and delete endpoint\n",
-        "endpoint.delete(force=True)\n",
+        "endpoint.undeploy_all()\n",
+        "endpoint.delete()\n",
         "\n",
-        "# Delete the model resource\n",
+        "#Delete the model resource\n",
         "model.delete()\n",
         "\n",
         "# Delete the container image from Artifact Registry\n",
         "!gcloud artifacts docker images delete \\\n",
         "    --quiet \\\n",
         "    --delete-tags \\\n",
-        "    {REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}"
+        "    {REGION}-docker.pkg.dev/{PROJECT_ID}/{REPOSITORY}/{IMAGE}\n",
+        "\n",
+        "# Delete the artifact registry\n",
+        "if delete_art_repo or os.getenv(\"IS_TESTING\"):\n",
+        "    ! gcloud artifacts repositories delete {REPOSITORY} --location=$REGION -q\n",
+        "    \n",
+        "# Delete the Cloud Storage bucket\n",
+        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
+        "    ! gsutil -m rm -r $BUCKET_URI"
       ]
     }
   ],
   "metadata": {
     "colab": {
       "collapsed_sections": [],
-      "name": "AI_Platform_(Unified)_SDK_Custom_Container_Prediction.ipynb",
+      "name": "SDK_Custom_Container_Prediction.ipynb",
       "toc_visible": true
     },
     "kernelspec": {

notebooks/official/custom/custom-tabular-bq-managed-dataset.ipynb

@@ -44,7 +44,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/custom/custom-tabular-bq-managed-dataset.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/custom/custom-tabular-bq-managed-dataset.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -263,7 +263,7 @@
         "\n",
         "2. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
         "\n",
-        "3. [Enable the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com).\n",
+        "3. [Enable the following APIs: Vertex AI API, Cloud Resource Manager API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,cloudresourcemanager.googleapis.com).\n",
         "\n",
         "4. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
         "\n",

notebooks/official/custom/sdk-custom-image-classification-batch.ipynb

@@ -44,7 +44,7 @@
         "    </a>\n",
         "  </td>\n",
         " <td>\n",
-        "    <a href=\"https://console.cloud.google.com/ai/platform/notebooks/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/tree/main/notebooks/official/automl/automl-text-classification.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/custom/sdk-custom-image-classification-batch.ipynb\">\n",
         "        <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -65,17 +65,6 @@
         "This tutorial demonstrates how to use the Vertex AI SDK for Python to train and deploy a custom image classification model for batch prediction."
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "dataset:custom,cifar10,icn"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "The dataset used for this tutorial is the [cifar10 dataset](https://www.tensorflow.org/datasets/catalog/cifar10) from [TensorFlow Datasets](https://www.tensorflow.org/datasets/catalog/overview). The version of the dataset you will use is built into TensorFlow. The trained model predicts which type of class an image is from ten classes: airplane, automobile, bird, cat, deer, dog, frog, horse, ship, truck."
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -103,6 +92,17 @@
         "- Make a batch prediction."
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "dataset:custom,cifar10,icn"
+      },
+      "source": [
+        "### Dataset\n",
+        "\n",
+        "The dataset used for this tutorial is the [cifar10 dataset](https://www.tensorflow.org/datasets/catalog/cifar10) from [TensorFlow Datasets](https://www.tensorflow.org/datasets/catalog/overview). The version of the dataset you will use is built into TensorFlow. The trained model predicts which type of class an image is from ten classes: airplane, automobile, bird, cat, deer, dog, frog, horse, ship, truck."
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {

notebooks/official/custom/sdk-custom-image-classification-online.ipynb

@@ -65,17 +65,6 @@
         "This tutorial demonstrates how to use the Vertex AI SDK for Python to train and deploy a custom image classification model for online prediction."
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "dataset:custom,cifar10,icn"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "The dataset used for this tutorial is the [cifar10 dataset](https://www.tensorflow.org/datasets/catalog/cifar10) from [TensorFlow Datasets](https://www.tensorflow.org/datasets/catalog/overview). The version of the dataset you will use is built into TensorFlow. The trained model predicts which type of class an image is from ten classes: airplane, automobile, bird, cat, deer, dog, frog, horse, ship, truck."
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -103,6 +92,17 @@
         "- Undeploy the `Model` resource."
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "dataset:custom,cifar10,icn"
+      },
+      "source": [
+        "### Dataset\n",
+        "\n",
+        "The dataset used for this tutorial is the [cifar10 dataset](https://www.tensorflow.org/datasets/catalog/cifar10) from [TensorFlow Datasets](https://www.tensorflow.org/datasets/catalog/overview). The version of the dataset you will use is built into TensorFlow. The trained model predicts which type of class an image is from ten classes: airplane, automobile, bird, cat, deer, dog, frog, horse, ship, truck."
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {

notebooks/official/experiments/build_model_experimentation_lineage_with_prebuild_code.ipynb

@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# Copyright 2022 Google LLC\n",
+        "# Copyright 2021 Google LLC\n",
         "#\n",
         "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
         "# you may not use this file except in compliance with the License.\n",
@@ -29,6 +29,8 @@
         "id": "JAPoU8Sm5E6e"
       },
       "source": [
+        "# Build Vertex AI Experiment lineage for custom training\n",
+        "\n",
         "<table align=\"left\">\n",
         "\n",
         "  <td>\n",
@@ -43,7 +45,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/experiments/build_model_experimentation_lineage_with_prebuild_code.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/experiments/build_model_experimentation_lineage_with_prebuild_code.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -54,13 +56,31 @@
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "tvgnzT1CKxrO"
+        "id": "d975c5729f18"
       },
       "source": [
         "## Overview\n",
         "\n",
-        "As a Data Scientist, you want to be able to reuse code path (data preprocessing, feature engineering etc...) that others within your team have written to simplify and standardize all the complex data wrangling. \n",
+        "As a Data Scientist, you want to be able to reuse code path (data preprocessing, feature engineering etc...) that others within your team have written to simplify and standardize all the complex data wrangling. "
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "3a0f8061b9c1"
+      },
+      "source": [
+        "### Objective\n",
         "\n",
+        "In this notebook, you learn how to integrate preprocessing code in a Vertex AI experiments. Also you build the experiment lineage lets you record, analyze, debug, and audit metadata and artifacts produced along your ML journey."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "tvgnzT1CKxrO"
+      },
+      "source": [
         "### Dataset\n",
         "\n",
         "This dataset is the UCI News Aggregator Data Set which contains 422,937 news collected between March 10th, 2014 and August 10th, 2014. Below are example records from the dataset:\n",
@@ -72,13 +92,15 @@
         "|2  |Fed's Charles Plosser sees high bar for change in pace of tapering   |http://www.livemint.com/Politics/H2EvwJSK2VE6OF7iK1g3PP/Feds-Charles-Plosser-sees-high-bar-for-change-in-pace-of-ta.html   |Livemint         |b       |ddUyU0VZz0BRneMioxUPQVP6sIxvM|www.livemint.com   |1394470371207|\n",
         "|3  |US open: Stocks fall after Fed official hints at accelerated tapering|http://www.ifamagazine.com/news/us-open-stocks-fall-after-fed-official-hints-at-accelerated-tapering-294436                |IFA Magazine     |b       |ddUyU0VZz0BRneMioxUPQVP6sIxvM|www.ifamagazine.com|1394470371550|\n",
         "|4  |Fed risks falling 'behind the curve', Charles Plosser says           |http://www.ifamagazine.com/news/fed-risks-falling-behind-the-curve-charles-plosser-says-294430                             |IFA Magazine     |b       |ddUyU0VZz0BRneMioxUPQVP6sIxvM|www.ifamagazine.com|1394470371793|\n",
-        "|5  |Fed's Plosser: Nasty Weather Has Curbed Job Growth                   |http://www.moneynews.com/Economy/federal-reserve-charles-plosser-weather-job-growth/2014/03/10/id/557011                   |Moneynews        |b       |ddUyU0VZz0BRneMioxUPQVP6sIxvM|www.moneynews.com  |1394470372027|\n",
-        "\n",
-        "\n",
-        "### Objective\n",
-        "\n",
-        "In this notebook, you learn how to integrate preprocessing code in a Vertex AI experiments. Also you will build the experiment lineage lets you record, analyze, debug, and audit metadata and artifacts produced along your ML journey.\n",
-        "\n",
+        "|5  |Fed's Plosser: Nasty Weather Has Curbed Job Growth                   |http://www.moneynews.com/Economy/federal-reserve-charles-plosser-weather-job-growth/2014/03/10/id/557011                   |Moneynews        |b       |ddUyU0VZz0BRneMioxUPQVP6sIxvM|www.moneynews.com  |1394470372027|"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "5e2eba58ad71"
+      },
+      "source": [
         "### Costs \n",
         "\n",
         "This tutorial uses billable components of Google Cloud:\n",
@@ -150,7 +172,7 @@
       "source": [
         "### Install additional packages\n",
         "\n",
-        "Install additional package dependencies not installed in your notebook environment, such as TensorFlow or Vertex AI SDK. Use the latest major GA version of each package."
+        "Install additional package dependencies not installed in your notebook environment,TensorFlow or Vertex AI SDK. Use the latest major GA version of each package."
       ]
     },
     {
@@ -174,9 +196,8 @@
         "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
         "\n",
-        "! pip3 install {USER_FLAG} --upgrade fsspec gcsfs joblib -q\n",
-        "! pip3 install {USER_FLAG} --force-reinstall 'google-cloud-aiplatform>=1.15' -q\n",
-        "! pip3 install {USER_FLAG} --upgrade sklearn"
+        "! pip3 install {USER_FLAG} --upgrade joblib fsspec gcsfs scikit-learn -q\n",
+        "! pip install {USER_FLAG} --upgrade google-cloud-aiplatform -q"
       ]
     },
     {
@@ -209,21 +230,14 @@
         "    app.kernel.do_shutdown(True)"
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "lWEdiXsJg0XY"
-      },
-      "source": [
-        "## Before you begin"
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
         "id": "BF1j6f9HApxa"
       },
       "source": [
+        "## Before you begin\n",
+        "\n",
         "### Set up your Google Cloud project\n",
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
@@ -232,9 +246,9 @@
         "\n",
         "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
         "\n",
-        "1. [Enable the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com).\n",
+        "1. [Enable APIs](https://console.cloud.google.com/flows/enableapi?apiid=cloudresourcemanager.googleapis.com,aiplatform.googleapis.com).\n",
         "\n",
-        "1. If you are running this notebook locally, you will need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
+        "1. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
         "\n",
         "1. Enter your project ID in the cell below. Then run the cell to make sure the\n",
         "Cloud SDK uses the right project for all the commands in this notebook.\n",
@@ -344,9 +358,9 @@
         "id": "06571eb4063b"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append it onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -357,9 +371,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -371,7 +392,7 @@
         "### Authenticate your Google Cloud account\n",
         "\n",
         "**If you are using Vertex AI Workbench Notebooks**, your environment is already\n",
-        "authenticated. Skip this step."
+        "authenticated."
       ]
     },
     {
@@ -393,9 +414,14 @@
         "3. In the **Service account name** field, enter a name, and\n",
         "   click **Create**.\n",
         "\n",
-        "4. In the **Grant this service account access to project** section, click the **Role** drop-down list. Type \"Vertex AI\"\n",
-        "into the filter box, and select\n",
-        "   **Vertex AI Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
+        "4. In the **Grant this service account access to project** section, click the **Role** drop-down list. Type and select\n",
+        "the following role into the filter box:\n",
+        "\n",
+        "    *   Storage Admin\n",
+        "    *   Storage Object Admin\n",
+        "    *   Service Account User\n",
+        "    *   Vertex AI Administrator\n",
+        "\n",
         "\n",
         "5. Click *Create*. A JSON file that contains your key downloads to your\n",
         "local environment.\n",
@@ -480,7 +506,7 @@
       "outputs": [],
       "source": [
         "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
-        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + TIMESTAMP\n",
+        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + UUID\n",
         "    BUCKET_URI = f\"gs://{BUCKET_NAME}\""
       ]
     },
@@ -533,17 +559,6 @@
         "### Set project folder"
       ]
     },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "AARD6Fsr-DSi"
-      },
-      "outputs": [],
-      "source": [
-        "DATA_PATH = \"data\""
-      ]
-    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -552,6 +567,7 @@
       },
       "outputs": [],
       "source": [
+        "DATA_PATH = \"data\"\n",
         "!mkdir -m 777 -p {DATA_PATH}"
       ]
     },
@@ -564,17 +580,6 @@
         "### Get the data"
       ]
     },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "3V6W2nIo9FtL"
-      },
-      "outputs": [],
-      "source": [
-        "DATASET_URL = \"https://archive.ics.uci.edu/ml/machine-learning-databases/00359/NewsAggregatorDataset.zip\""
-      ]
-    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -583,6 +588,7 @@
       },
       "outputs": [],
       "source": [
+        "DATASET_URL = \"https://archive.ics.uci.edu/ml/machine-learning-databases/00359/NewsAggregatorDataset.zip\"\n",
         "!wget --no-parent {DATASET_URL} --directory-prefix={DATA_PATH}\n",
         "!mkdir -m 777 -p {DATA_PATH}/temp {DATA_PATH}/raw\n",
         "!unzip {DATA_PATH}/*.zip -d {DATA_PATH}/temp\n",
@@ -623,10 +629,13 @@
         "logger = logging.getLogger(\"logger\")\n",
         "logging.basicConfig(level=logging.INFO)\n",
         "\n",
+        "import collections\n",
         "import tempfile\n",
         "import time\n",
         "from json import dumps\n",
         "\n",
+        "collections.Iterable = collections.abc.Iterable\n",
+        "\n",
         "# Vertex AI\n",
         "from google.cloud import aiplatform as vertex_ai"
       ]
@@ -655,7 +664,7 @@
         "# Experiments\n",
         "TASK = \"classification\"\n",
         "MODEL_TYPE = \"naivebayes\"\n",
-        "EXPERIMENT_NAME = f\"{TASK}-{MODEL_TYPE}-{TIMESTAMP}\"\n",
+        "EXPERIMENT_NAME = f\"{TASK}-{MODEL_TYPE}-{UUID}\"\n",
         "EXPERIMENT_RUN_NAME = \"run-1\"\n",
         "\n",
         "# Preprocessing\n",
@@ -683,7 +692,7 @@
         "FEATURES = \"title\"\n",
         "TEST_SIZE = 0.2\n",
         "SEED = 8\n",
-        "TRAINED_MODEL_URI = f\"{BUCKET_URI}/deliverables/{TIMESTAMP}\"\n",
+        "TRAINED_MODEL_URI = f\"{BUCKET_URI}/deliverables/{UUID}\"\n",
         "MODEL_NAME = f\"{EXPERIMENT_NAME}-model\""
       ]
     },
@@ -793,7 +802,7 @@
       "source": [
         "#### Create a Dataset Metadata Artifact\n",
         "\n",
-        "First you create the Dataset artifact to track the dataset resource in the Vertex AI ML Metadata and create the experiment lineage."
+        "First you create the Dataset artifact to track the dataset resource in the Vertex ML Metadata and create the experiment lineage."
       ]
     },
     {
@@ -832,7 +841,6 @@
         "Preprocess module\n",
         "\"\"\"\n",
         "\n",
-        "import string\n",
         "\n",
         "import pandas as pd\n",
         "\n",
@@ -862,7 +870,10 @@
       "source": [
         "#### Add the `preprocessing` Execution\n",
         "\n",
-        "You add the preprocessing step to track its execution in the lineage associated to Vertex AI Experiment. "
+        "Vertex AI Experiments supports tracking both executions and artifacts. Executions are steps in an ML workflow that can include but are not limited to data preprocessing, training, and model evaluation. Executions can consume artifacts such as datasets and produce artifacts such as models.\n",
+        "\n",
+        "You add the preprocessing step to track its execution in the lineage associated to Vertex AI Experiment. \n",
+        "For Vertex AI, the parameters are passed inside the message field which we see in the logs. These structures of the logs are predefined."
       ]
     },
     {
@@ -936,7 +947,16 @@
       "source": [
         "#### Create model training module\n",
         "\n",
-        "Below the training module."
+        "Below the training module.\n",
+        "\n",
+        "**get_training_split :** It takes parameters like  x(The data to be split), y(The labels to be split), test_size(The proportion of the data to be reserved for testing) and random_state(The seed used by the random number generator).\n",
+        "This function return training data, testing data , The training labels and The testing labels.\n",
+        "\n",
+        "**get_pipeline :** It return's the model.\n",
+        "\n",
+        "**train_pipeline :** It train the model by using model, training data, training lables and return's the trained model.\n",
+        "\n",
+        "**evaluate_model :** It evaluate the model and return the accuracy of the model.\n"
       ]
     },
     {
@@ -1144,6 +1164,15 @@
         "    exc.assign_output_artifacts([model])"
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "e595c893de8d"
+      },
+      "source": [
+        "### Stop Experiment run"
+      ]
+    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -1163,7 +1192,7 @@
       "source": [
         "### Visualize Experiment Lineage\n",
         "\n",
-        "Below you will get the link to Vertex AI Metadata UI in the console that will show the experiment lineage."
+        "Below you get the link to Vertex AI Metadata UI in the console that show the experiment lineage."
       ]
     },
     {
@@ -1201,17 +1230,8 @@
       "source": [
         "# Delete experiment\n",
         "exp = vertex_ai.Experiment(EXPERIMENT_NAME)\n",
-        "exp.delete()"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "gW8Ddbr8xaKp"
-      },
-      "outputs": [],
-      "source": [
+        "exp.delete()\n",
+        "\n",
         "# Delete model\n",
         "model_list = vertex_ai.Model.list(filter=f'display_name=\"{MODEL_NAME}\"')\n",
         "for model in model_list:\n",
@@ -1223,22 +1243,26 @@
         "        filter=f'display_name=\"{dataset_name}\"'\n",
         "    )\n",
         "    for dataset in dataset_list:\n",
-        "        dataset.delete()"
+        "        dataset.delete()\n",
+        "\n",
+        "# Delete Cloud Storage objects that were created\n",
+        "delete_bucket = True\n",
+        "\n",
+        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
+        "    ! gsutil -m rm -r $BUCKET_URI\n",
+        "\n",
+        "!rm -Rf {DATA_PATH}"
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "sx_vKniMq9ZX"
+        "id": "3f00c455b930"
       },
       "outputs": [],
       "source": [
-        "# Delete Cloud Storage objects that were created\n",
-        "delete_bucket = True\n",
-        "\n",
-        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
-        "    ! gsutil -m rm -r $BUCKET_URI"
+        "!rm -Rf {DATA_PATH}"
       ]
     }
   ],

notebooks/official/experiments/comparing_pipeline_runs.ipynb

@@ -3,7 +3,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "ed0fca3f",
       "metadata": {
         "id": "ur8xi4C7S06n"
       },
@@ -26,21 +25,12 @@
     },
     {
       "cell_type": "markdown",
-      "id": "6e92def7-b4f0-4100-b981-82972665d19d",
-      "metadata": {
-        "id": "847715f095b5"
-      },
-      "source": [
-        "# Vertex AI: Comparing Pipeline Runs"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "id": "ffada1ce",
       "metadata": {
         "id": "JAPoU8Sm5E6e"
       },
       "source": [
+        "# Compare pipeline runs with Vertex AI Experiments\n",
+        "\n",
         "<table align=\"left\">\n",
         "\n",
         "  <td>\n",
@@ -55,7 +45,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/experiments/comparing_pipeline_runs.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/experiments/comparing_pipeline_runs.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -65,7 +55,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "d118d181",
       "metadata": {
         "id": "tvgnzT1CKxrO"
       },
@@ -77,7 +66,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "b6201ad0-af42-48fd-b03d-403fd235e268",
       "metadata": {
         "id": "d220917f1302"
       },
@@ -99,7 +87,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "cffa7608-f550-4913-8f88-30cbcd525685",
       "metadata": {
         "id": "263933842022"
       },
@@ -111,7 +98,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "b46c0eb6-e65d-4b28-b17d-dc9bf9b08120",
       "metadata": {
         "id": "de76bb18c85b"
       },
@@ -132,7 +118,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "ee1e6851",
       "metadata": {
         "id": "gCuSR8GkAgzl"
       },
@@ -175,7 +160,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "97e5b386",
       "metadata": {
         "id": "i7EUnXsZhAGF"
       },
@@ -188,7 +172,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "5b01540f",
       "metadata": {
         "id": "2b4ef9b72d43"
       },
@@ -207,15 +190,12 @@
         "if IS_WORKBENCH_NOTEBOOK:\n",
         "    USER_FLAG = \"--user\"\n",
         "\n",
-        "! pip install {USER_FLAG} --upgrade google-cloud-aiplatform \\\n",
-        "                                    google-cloud-storage \\\n",
-        "                                    google-auth \\\n",
-        "                                    kfp -q"
+        "!pip3 install {USER_FLAG} --force-reinstall 'google-cloud-aiplatform>=1.15' -q --no-warn-conflicts\n",
+        "!pip3 install {USER_FLAG} kfp -q --no-warn-conflicts"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "c6806ee8",
       "metadata": {
         "id": "hhq5zEbGg0XX"
       },
@@ -228,7 +208,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "584f0887",
       "metadata": {
         "id": "EzrelQZ22IZj"
       },
@@ -247,7 +226,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "bb098c06",
       "metadata": {
         "id": "lWEdiXsJg0XY"
       },
@@ -257,7 +235,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "3706598b",
       "metadata": {
         "id": "BF1j6f9HApxa"
       },
@@ -270,7 +247,7 @@
         "\n",
         "1. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
         "\n",
-        "1. [Enable the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com).\n",
+        "1. [Enable APIs](https://console.cloud.google.com/flows/enableapi?apiid=cloudresourcemanager.googleapis.com,aiplatform.googleapis.com).\n",
         "\n",
         "1. If you are running this notebook locally, you will need to install the [Cloud SDK](https://cloud.google.com/sdk).\n",
         "\n",
@@ -282,7 +259,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "c7f6a1ea",
       "metadata": {
         "id": "WReHDGG5g0XY"
       },
@@ -295,7 +271,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "6984e874-ae15-4094-9c5b-8d12661645c9",
       "metadata": {
         "id": "3c8049930470"
       },
@@ -307,7 +282,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "ebaef2f9",
       "metadata": {
         "id": "oM1iC_MfAts1"
       },
@@ -325,7 +299,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "d9745b2b-cd37-4a1c-aae7-4cd75a3c126c",
       "metadata": {
         "id": "f2e3c0f2cbfb"
       },
@@ -336,7 +309,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "fff3c4af",
       "metadata": {
         "id": "qJYoRfYng0XZ"
       },
@@ -347,7 +319,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "89a05131",
       "metadata": {
         "id": "riG_qUokg0XZ"
       },
@@ -359,7 +330,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "9aa4ad5f",
       "metadata": {
         "id": "2aa333eca058"
       },
@@ -381,7 +351,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "244d416e",
       "metadata": {
         "id": "d8b34ef9a3d0"
       },
@@ -395,7 +364,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "eed6c3ba",
       "metadata": {
         "id": "126548a06aa1"
       },
@@ -408,7 +376,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "6ef7c7b1",
       "metadata": {
         "id": "e660b8504e63"
       },
@@ -428,7 +395,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "5763da2c",
       "metadata": {
         "id": "sBCra4QMA2wR"
       },
@@ -451,9 +417,14 @@
         "3. In the **Service account name** field, enter a name, and\n",
         "   click **Create**.\n",
         "\n",
-        "4. In the **Grant this service account access to project** section, click the **Role** drop-down list. Type \"Vertex AI\"\n",
-        "into the filter box, and select\n",
-        "   **Vertex AI Administrator**. Type \"Storage Object Admin\" into the filter box, and select **Storage Object Admin**.\n",
+        "4. In the **Grant this service account access to project** section, click the **Role** drop-down list. Type and select\n",
+        "the following role into the filter box:\n",
+        "\n",
+        "    *   Storage Admin\n",
+        "    *   Storage Object Admin\n",
+        "    *   Service Account User\n",
+        "    *   Vertex AI Administrator\n",
+        "\n",
         "\n",
         "5. Click *Create*. A JSON file that contains your key downloads to your\n",
         "local environment.\n",
@@ -465,7 +436,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "85b826d2",
       "metadata": {
         "id": "PyQmSRbKA8r-"
       },
@@ -498,7 +468,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "3d31b8b8",
       "metadata": {
         "id": "zgPO1eR3CYjk"
       },
@@ -515,7 +484,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "95a18950",
       "metadata": {
         "id": "MzGDU7TWdts_"
       },
@@ -528,7 +496,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "379d758a",
       "metadata": {
         "id": "cf221059d072"
       },
@@ -541,7 +508,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "50b86adc",
       "metadata": {
         "id": "-EcIXiGsCePi"
       },
@@ -552,7 +518,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "564ce38f",
       "metadata": {
         "id": "NIq7R4HZCfIc"
       },
@@ -563,7 +528,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "a4324d2e",
       "metadata": {
         "id": "ucvCsknMCims"
       },
@@ -574,7 +538,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "df030498-f6e7-4e45-96f4-0d36590865aa",
       "metadata": {
         "id": "vhOb7YnwClBb"
       },
@@ -585,7 +548,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "49d12f54",
       "metadata": {
         "id": "b7e24e522bee"
       },
@@ -598,7 +560,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "8da829a1",
       "metadata": {
         "id": "77b01a1fdbb4"
       },
@@ -610,7 +571,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "f2c8c41d",
       "metadata": {
         "id": "121d7ca29426"
       },
@@ -640,7 +600,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "f0552e61",
       "metadata": {
         "id": "aa175e2960ac"
       },
@@ -653,7 +612,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "abbfcad3",
       "metadata": {
         "id": "f88cb0488c08"
       },
@@ -666,7 +624,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "2689f52b",
       "metadata": {
         "id": "fXUqOdIaLbjf"
       },
@@ -677,7 +634,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "754e5f7b",
       "metadata": {
         "id": "9fYX14c0LfmU"
       },
@@ -690,7 +646,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "231e5499",
       "metadata": {
         "id": "XoEqT2Y4DJmf"
       },
@@ -701,7 +656,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "884b2d31",
       "metadata": {
         "id": "pRUOFELefqf1"
       },
@@ -720,13 +674,13 @@
         "import kfp.v2.dsl as dsl\n",
         "# Vertex AI\n",
         "from google.cloud import aiplatform as vertex_ai\n",
+        "from google.cloud.aiplatform_v1.types.pipeline_state import PipelineState\n",
         "from kfp.v2.dsl import Metrics, Model, Output, component"
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "20e96b6b",
       "metadata": {
         "id": "OAY0QKZD8qNP"
       },
@@ -738,6 +692,7 @@
         "EXPERIMENT_NAME = f\"{PROJECT_ID}-{TASK}-{MODEL_TYPE}-{UUID}\"\n",
         "\n",
         "# Pipeline\n",
+        "PIPELINE_TEMPLATE_FILE = \"pipeline.json\"\n",
         "PIPELINE_URI = f\"{BUCKET_URI}/pipelines\"\n",
         "TRAIN_URI = f\"{BUCKET_URI}/iris/iris_data.csv\"\n",
         "LABEL_URI = f\"{BUCKET_URI}/iris/iris_target.csv\"\n",
@@ -746,7 +701,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "3fb7c387",
       "metadata": {
         "id": "inR70nh38PeK"
       },
@@ -759,7 +713,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "6eb614be",
       "metadata": {
         "id": "Nz0nasrh8T3c"
       },
@@ -770,7 +723,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "01448e2a",
       "metadata": {
         "id": "container:training,prediction,xgboost"
       },
@@ -789,7 +741,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "ece742dc",
       "metadata": {
         "id": "XujRA5ueox9U"
       },
@@ -802,7 +753,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "32a2397a",
       "metadata": {
         "id": "t1NLYz1R-KWv"
       },
@@ -812,22 +762,18 @@
     },
     {
       "cell_type": "markdown",
-      "id": "64570881",
       "metadata": {
         "id": "jnfKxpj0-Z0H"
       },
       "source": [
         "Before you start running your pipeline experiments, you have to formalize your training as pipeline component.\n",
         "\n",
-        "To do that, you will use the `kfp.v2.dsl.component` decorator to convert your training task into a pipeline component.\n",
-        "\n",
-        "Training code will import required libraries to train,evaluate and save a model with mentioned features. "
+        "To do that, you build the pipeline by using the `kfp.v2.dsl.component` decorator to convert your training task into a pipeline component. "
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "f612dbf2",
       "metadata": {
         "id": "jv_-vU46_eFN"
       },
@@ -966,7 +912,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "bf048b2a",
       "metadata": {
         "id": "U1UiTZhkVoFM"
       },
@@ -979,7 +924,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "7684850a",
       "metadata": {
         "id": "9Gfr6pNLU-dB"
       },
@@ -1002,7 +946,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "cb6cae0b",
       "metadata": {
         "id": "RkfZ7qVAVjBO"
       },
@@ -1013,7 +956,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "c6b9ec3f",
       "metadata": {
         "id": "oYlLBGUSVibG"
       },
@@ -1024,7 +966,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "cc940f17",
       "metadata": {
         "id": "95vG4-zPWc0B"
       },
@@ -1034,7 +975,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "bb2b2eb4",
       "metadata": {
         "id": "ZNb6kZ2l5t-O"
       },
@@ -1047,7 +987,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "77314a6f",
       "metadata": {
         "id": "XPy0Jc8xXgpa"
       },
@@ -1065,7 +1004,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "aee97ebf",
       "metadata": {
         "id": "G0hm1no_WY8o"
       },
@@ -1075,7 +1013,7 @@
         "\n",
         "    job = vertex_ai.PipelineJob(\n",
         "        display_name=f\"{EXPERIMENT_NAME}-pipeline-run-{i}\",\n",
-        "        template_path=\"pipeline.json\",\n",
+        "        template_path=PIPELINE_TEMPLATE_FILE,\n",
         "        pipeline_root=PIPELINE_URI,\n",
         "        parameter_values={\n",
         "            \"train_uri\": TRAIN_URI,\n",
@@ -1089,7 +1027,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "0ca08588",
       "metadata": {
         "id": "O8TV4q535c2M"
       },
@@ -1102,7 +1039,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "a65f2574",
       "metadata": {
         "id": "dlCEJKfH5xR7"
       },
@@ -1114,7 +1050,6 @@
     },
     {
       "cell_type": "markdown",
-      "id": "f605666a-9f2a-479f-9948-6f2f29e4e76b",
       "metadata": {
         "id": "98c022ca36b4"
       },
@@ -1125,7 +1060,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "dc6661c5",
       "metadata": {
         "id": "FA9W85vs7LLD"
       },
@@ -1152,7 +1086,6 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "ef041ba2",
       "metadata": {
         "id": "ISsK9Msi-Kqs"
       },
@@ -1160,15 +1093,13 @@
       "source": [
         "# Get the PipelineJob resource using the experiment run name\n",
         "pipeline_experiments_df = vertex_ai.get_experiment_df(EXPERIMENT_NAME)\n",
-        "for i in range(5):\n",
-        "    job = vertex_ai.PipelineJob.get(pipeline_experiments_df.run_name[i])\n",
-        "    print(job.resource_name)\n",
-        "    print(job._dashboard_uri())"
+        "job = vertex_ai.PipelineJob.get(pipeline_experiments_df.run_name[0])\n",
+        "print(\"Pipeline job name: \", job.resource_name)\n",
+        "print(\"Pipeline Run UI link: \", job._dashboard_uri())"
       ]
     },
     {
       "cell_type": "markdown",
-      "id": "02a718ab",
       "metadata": {
         "id": "TpV-iwP9qw9c"
       },
@@ -1184,20 +1115,22 @@
     {
       "cell_type": "code",
       "execution_count": null,
-      "id": "e90fb0b1",
       "metadata": {
         "id": "6xbYQn5t5Noe"
       },
       "outputs": [],
       "source": [
         "# Delete the pipeline\n",
-        "# Get the PipelineJob resource using the experiment run name\n",
-        "pipeline_experiments_df = vertex_ai.get_experiment_df(EXPERIMENT_NAME)\n",
-        "for i in range(5):\n",
-        "    job = vertex_ai.PipelineJob.get(pipeline_experiments_df.run_name[i])\n",
-        "    print(job.resource_name)\n",
-        "    print(job._dashboard_uri())\n",
-        "    job.delete()\n",
+        "while True:\n",
+        "    for i in range(0, len(runs)):\n",
+        "        pipeline_job = vertex_ai.PipelineJob.get(pipeline_experiments_df.run_name[i])\n",
+        "        if pipeline_job.state != PipelineState.PIPELINE_STATE_SUCCEEDED:\n",
+        "            print(\"Pipeline job is still running...\")\n",
+        "            time.sleep(60)\n",
+        "        else:\n",
+        "            print(\"Pipeline job is complete.\")\n",
+        "            pipeline_job.delete()\n",
+        "    break\n",
         "\n",
         "# Delete experiment\n",
         "exp = vertex_ai.Experiment(EXPERIMENT_NAME)\n",
@@ -1206,7 +1139,11 @@
         "# Delete bucket\n",
         "delete_bucket = False\n",
         "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
-        "    ! gsutil rm -rf {BUCKET_URI}"
+        "    ! gsutil rm -rf {BUCKET_URI}\n",
+        "\n",
+        "# Remove local files\n",
+        "\n",
+        "!rm {PIPELINE_TEMPLATE_FILE}"
       ]
     }
   ],

notebooks/official/explainable_ai/sdk_automl_tabular_binary_classification_batch_explain.ipynb

@@ -29,7 +29,7 @@
         "id": "title"
       },
       "source": [
-        "# Vertex SDK: AutoML training tabular binary classification model for batch explanation\n",
+        "# Vertex AI SDK: AutoML training tabular binary classification model for batch explanation\n",
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
@@ -44,7 +44,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/tree/main/notebooks/official/explainable_ai/sdk_automl_tabular_binary_classification_batch_explain.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_automl_tabular_binary_classification_batch_explain.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",
@@ -65,17 +65,6 @@
         "This tutorial demonstrates how to use the Vertex AI SDK to create tabular binary classification models and do batch prediction with explanation using a Google Cloud [AutoML](https://cloud.google.com/vertex-ai/docs/start/automl-users) model."
       ]
     },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "dataset:bank,lbn"
-      },
-      "source": [
-        "### Dataset\n",
-        "\n",
-        "The dataset used for this tutorial is the [Bank Marketing](https://pantheon.corp.google.com/storage/browser/_details/cloud-ml-tables-data/bank-marketing.csv) . This dataset does not require any feature engineering. The version of the dataset you will use in this tutorial is stored in a public Cloud Storage bucket."
-      ]
-    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -108,6 +97,17 @@
         "* Batch Prediction Service: Does a queued (batch) prediction for the entire set of instances in the background and stores the results in a Cloud Storage bucket when ready."
       ]
     },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "7a4881cf39a4"
+      },
+      "source": [
+        "### Dataset\n",
+        "\n",
+        "The dataset used for this tutorial is the Bank Marketing. This dataset does not require any feature engineering. The version of the dataset you use in this tutorial is stored in a public Cloud Storage bucket."
+      ]
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -136,7 +136,7 @@
       "source": [
         "### Set up your local development environment\n",
         "\n",
-        "If you are using Colab or Vertex Workbench Notebook, your environment already meets all the requirements to run this notebook. You can skip this step.\n",
+        "If you are using Colab or Vertex AI Workbench Notebook, your environment already meets all the requirements to run this notebook. You can skip this step.\n",
         "\n",
         "Otherwise, make sure your environment meets this notebook's requirements. You need the following:\n",
         "\n",
@@ -322,7 +322,10 @@
       },
       "outputs": [],
       "source": [
-        "REGION = \"us-central1\"  # @param {type: \"string\"}"
+        "REGION = \"[your-region]\"  # @param {type: \"string\"}\n",
+        "\n",
+        "if REGION == \"[your-region]\":\n",
+        "    REGION = \"us-central1\""
       ]
     },
     {
@@ -331,9 +334,8 @@
         "id": "timestamp"
       },
       "source": [
-        "#### Timestamp\n",
-        "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+        "#### UUID\n",
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append the uuid onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -344,9 +346,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of length 8\n",
+        "def generate_uuid():\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=8))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -357,7 +366,7 @@
       "source": [
         "### Authenticate your Google Cloud account\n",
         "\n",
-        "**If you are using Workbench AI Notebooks**, your environment is already\n",
+        "**If you are using Vertex AI Workbench Notebooks**, your environment is already\n",
         "authenticated. Skip this step.\n",
         "\n",
         "**If you are using Colab**, run the cell below and follow the instructions\n",
@@ -440,7 +449,7 @@
       },
       "outputs": [],
       "source": [
-        "BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}\n",
+        "BUCKET_NAME = \"[your-bucket-name]\"  # @param {type:\"string\"}\n",
         "BUCKET_URI = f\"gs://{BUCKET_NAME}\""
       ]
     },
@@ -453,7 +462,7 @@
       "outputs": [],
       "source": [
         "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"[your-bucket-name]\":\n",
-        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + TIMESTAMP\n",
+        "    BUCKET_NAME = PROJECT_ID + \"aip-\" + UUID\n",
         "    BUCKET_URI = \"gs://\" + BUCKET_NAME"
       ]
     },
@@ -583,7 +592,7 @@
       "source": [
         "#### Quick peek at your data\n",
         "\n",
-        "You will use a version of the Bank Marketing dataset that is stored in a public Cloud Storage bucket, using a CSV index file.\n",
+        "You use a version of the Bank Marketing dataset that is stored in a public Cloud Storage bucket, using a CSV index file.\n",
         "\n",
         "Start by doing a quick peek at the data. You count the number of examples by counting the number of rows in the CSV index file  (`wc -l`) and then peek at the first few rows.\n",
         "\n",
@@ -637,7 +646,7 @@
       "outputs": [],
       "source": [
         "dataset = aip.TabularDataset.create(\n",
-        "    display_name=\"Bank Marketing\" + \"_\" + TIMESTAMP, gcs_source=[IMPORT_FILE]\n",
+        "    display_name=\"Bank Marketing\" + \"_\" + UUID, gcs_source=[IMPORT_FILE]\n",
         ")\n",
         "\n",
         "print(dataset.resource_name)"
@@ -688,7 +697,7 @@
       "outputs": [],
       "source": [
         "dag = aip.AutoMLTabularTrainingJob(\n",
-        "    display_name=\"bank_\" + TIMESTAMP,\n",
+        "    display_name=\"bank_\" + UUID,\n",
         "    optimization_prediction_type=\"classification\",\n",
         "    optimization_objective=\"minimize-log-loss\",\n",
         ")\n",
@@ -730,7 +739,7 @@
       "source": [
         "model = dag.run(\n",
         "    dataset=dataset,\n",
-        "    model_display_name=\"bank_\" + TIMESTAMP,\n",
+        "    model_display_name=\"bank_\" + UUID,\n",
         "    training_fraction_split=0.6,\n",
         "    validation_fraction_split=0.2,\n",
         "    test_fraction_split=0.2,\n",
@@ -784,7 +793,7 @@
       "source": [
         "### Make test items\n",
         "\n",
-        "You will use synthetic data as a test data items. Don't be concerned that we are using synthetic data -- we just want to demonstrate how to make a prediction."
+        "You use synthetic data as a test data items. Don't be concerned that we are using synthetic data."
       ]
     },
     {
@@ -852,11 +861,11 @@
       "outputs": [],
       "source": [
         "batch_predict_job = model.batch_predict(\n",
-        "    job_display_name=\"bank_\" + TIMESTAMP,\n",
+        "    job_display_name=\"bank_\" + UUID,\n",
         "    gcs_source=gcs_input_uri,\n",
         "    gcs_destination_prefix=BUCKET_URI,\n",
         "    instances_format=\"csv\",\n",
-        "    predictions_format=\"csv\",\n",
+        "    predictions_format=\"jsonl\",\n",
         "    generate_explanation=True,\n",
         "    sync=False,\n",
         ")\n",
@@ -952,6 +961,7 @@
         "# Set this to true only if you'd like to delete your bucket\n",
         "delete_bucket = False\n",
         "\n",
+        "dataset.delete()\n",
         "model.delete()\n",
         "batch_predict_job.delete()\n",
         "\n",

notebooks/official/explainable_ai/sdk_automl_tabular_classification_online_explain.ipynb

@@ -33,18 +33,18 @@
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_tabular_classification_online_explain.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_automl_tabular_classification_online_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_tabular_classification_online_explain.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_automl_tabular_classification_online_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/tree/main/notebooks/official/explainable_ai/sdk_automl_tabular_binary_classification_online_explain.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_automl_tabular_classification_online_explain.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/official/explainable_ai/sdk_custom_image_classification_batch_explain.ipynb

@@ -44,7 +44,7 @@
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_image_classification_batch_explain.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_custom_image_classification_batch_explain.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/official/explainable_ai/sdk_custom_image_classification_online_explain.ipynb

@@ -33,18 +33,18 @@
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_custom_image_classification_online_explain.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_image_classification_online_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_custom_image_classification_online_explain.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_image_classification_online_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/tree/main/notebooks/official/explainable_ai/sdk_custom_image_classification_online_explain.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_custom_image_classification_online_explain.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/official/explainable_ai/sdk_custom_tabular_regression_batch_explain.ipynb

@@ -33,18 +33,18 @@
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_custom_tabular_regression_batch_explain.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_batch_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_custom_tabular_regression_batch_explain.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_batch_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/tree/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_batch_explain.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_batch_explain.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain.ipynb

@@ -33,18 +33,18 @@
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/tree/master/notebooks/official/automl/sdk_custom_tabular_regression_online_explain.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/tree/master/notebooks/official/automl/sdk_custom_tabular_regression_online_explain.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/tree/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain.ipynb\">\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>\n",

notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb

@@ -33,19 +33,20 @@
         "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/tree/master/notebooks/official/automl/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/tree/master/notebooks/official/automl/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://console.cloud.google.com/ai/platform/notebooks/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/tree/master/notebooks/official/automl/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb\">\n",
-        "      Open in Google Cloud Notebooks\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/vertex-ai-samples/main/notebooks/official/explainable_ai/sdk_custom_tabular_regression_online_explain_get_metadata.ipynb\">\n",
+        "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
+        "      Open in Vertex AI Workbench\n",
         "    </a>\n",
         "  </td>\n",
         "</table>\n",

notebooks/official/feature_store/sdk-feature-store.ipynb

@@ -29,18 +29,22 @@
         "id": "JAPoU8Sm5E6e"
       },
       "source": [
+        "# Online and Batch predictions using Vertex AI Feature Store\n",
+        "\n",
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/feature_store/sdk-feature-store.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/feature_store/sdk-feature-store.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/feature_store/sdk-feature-store.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/feature_store/sdk-feature-store.ipynb\">\n",
         "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\">\n",
         "      View on GitHub\n",
         "    </a>\n",
-        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/notebook_template.ipynb\">\n",
+        "    </td>\n",
+        "    <td>\n",
+        "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/feature_store/sdk-feature-store.ipynb\">\n",
         "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\">\n",
         "      Open in Vertex AI Workbench\n",
         "    </a>                                                                                           \n",
@@ -51,19 +55,22 @@
     {
       "cell_type": "markdown",
       "metadata": {
-        "id": "tvgnzT1CKxrO"
+        "id": "c4aaea3bab5e"
       },
       "source": [
         "## Overview\n",
         "\n",
         "This notebook introduces Vertex AI Feature Store, a managed cloud service for machine learning engineers and data scientists to store, serve, manage and share machine learning features at a large scale.\n",
         "\n",
-        "This notebook assumes that you understand basic Google Cloud concepts such as [Project](https://cloud.google.com/storage/docs/projects), [Storage](https://cloud.google.com/storage) and [Vertex AI](https://cloud.google.com/vertex-ai/docs). Some machine learning knowledge is also helpful but not required.\n",
-        "\n",
-        "### Dataset\n",
-        "\n",
-        "This notebook uses a movie recommendation dataset as an example throughout all the sessions. The task is to train a model to predict if a user is going to watch a movie and serve this model online. \n",
-        "\n",
+        "This notebook assumes that you understand basic Google Cloud concepts such as [Project](https://cloud.google.com/storage/docs/projects), [Storage](https://cloud.google.com/storage) and [Vertex AI](https://cloud.google.com/vertex-ai/docs). Some machine learning knowledge is also helpful but not required.\n"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "71779c8088bf"
+      },
+      "source": [
         "### Objective\n",
         "\n",
         "In this notebook, you will learn how to use `Vertex AI Feature Store` to import feature data, and to access the feature data for both online serving and offline tasks, such as training.\n",
@@ -72,15 +79,31 @@
         "\n",
         "- `Vertex AI Feature Store`\n",
         "\n",
-        "\n",
-        "\n",
         "The steps performed include:\n",
         "\n",
         "- Create featurestore, entity type, and feature resources.\n",
         "- Import feature data into `Vertex AI Feature Store` resource.\n",
         "- Serve online prediction requests using the imported features.\n",
-        "- Access imported features in offline jobs, such as training jobs.\n",
+        "- Access imported features in offline jobs, such as training jobs."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "55e01a856f57"
+      },
+      "source": [
+        "### Dataset\n",
         "\n",
+        "This notebook uses a movie recommendation dataset as an example throughout all the sessions. The task is to train a model to predict if a user is going to watch a movie and serve this model online."
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "tvgnzT1CKxrO"
+      },
+      "source": [
         "### Costs \n",
         "\n",
         "This tutorial uses billable components of Google Cloud:\n",
@@ -262,7 +285,15 @@
       },
       "outputs": [],
       "source": [
-        "PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}"
+        "import os\n",
+        "\n",
+        "PROJECT_ID = \"\"\n",
+        "\n",
+        "# Get your Google Cloud project ID from gcloud\n",
+        "if not os.getenv(\"IS_TESTING\"):\n",
+        "    shell_output = !gcloud config list --format 'value(core.project)' 2>/dev/null\n",
+        "    PROJECT_ID = shell_output[0]\n",
+        "    print(\"Project ID: \", PROJECT_ID)"
       ]
     },
     {
@@ -275,10 +306,7 @@
       "source": [
         "if PROJECT_ID == \"\" or PROJECT_ID is None:\n",
         "    PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}\n",
-        "    # Get your GCP project id from gcloud\n",
-        "    shell_output = ! gcloud config list --format 'value(core.project)' 2>/dev/null\n",
-        "    PROJECT_ID = shell_output[0]\n",
-        "    print(\"Project ID:\", PROJECT_ID)"
+        "print(\"Project ID: \", PROJECT_ID)"
       ]
     },
     {
@@ -320,7 +348,9 @@
       },
       "outputs": [],
       "source": [
-        "REGION = \"us-central1\"  # @param {type: \"string\"}"
+        "REGION = \"[your-region]\"  # @param {type:\"string\"}\n",
+        "if REGION == \"[your-region]\":\n",
+        "    REGION = \"us-central1\""
       ]
     },
     {
@@ -329,9 +359,9 @@
         "id": "timestamp"
       },
       "source": [
-        "#### Timestamp\n",
+        "#### UUID\n",
         "\n",
-        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a timestamp for each instance session, and append the timestamp onto the name of resources you create in this tutorial."
+        "If you are in a live tutorial session, you might be using a shared test account or project. To avoid name collisions between users on resources created, you create a uuid for each instance session, and append it onto the name of resources you create in this tutorial."
       ]
     },
     {
@@ -342,9 +372,16 @@
       },
       "outputs": [],
       "source": [
-        "from datetime import datetime\n",
+        "import random\n",
+        "import string\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")"
+        "\n",
+        "# Generate a uuid of a specifed length(default=8)\n",
+        "def generate_uuid(length: int = 8) -> str:\n",
+        "    return \"\".join(random.choices(string.ascii_lowercase + string.digits, k=length))\n",
+        "\n",
+        "\n",
+        "UUID = generate_uuid()"
       ]
     },
     {
@@ -356,7 +393,7 @@
         "### Authenticate your Google Cloud account\n",
         "\n",
         "**If you are using Vertex AI Workbench notebooks**, your environment is already\n",
-        "authenticated. Skip this step."
+        "authenticated."
       ]
     },
     {
@@ -441,7 +478,7 @@
       "source": [
         "from google.cloud.aiplatform import Feature, Featurestore\n",
         "\n",
-        "FEATURESTORE_ID = \"movie_prediction\"\n",
+        "FEATURESTORE_ID = \"movie_prediction\" + UUID\n",
         "INPUT_CSV_FILE = \"gs://cloud-samples-data-us-central1/vertex-ai/feature-store/datasets/movie_prediction.csv\"\n",
         "ONLINE_STORE_FIXED_NODE_COUNT = 1"
       ]
@@ -785,7 +822,7 @@
       "source": [
         "## Import Feature Values\n",
         "\n",
-        "You need to import feature values before you can use them for online/offline serving. In this step, you learn how to import feature values by ingesting the values from GCS (Google Cloud Storage). You can also import feature values from BigQuery or a Pandas dataframe.\n"
+        "You need to import feature values before you can use them for online/offline serving. In this step, you learn how to import feature values by ingesting the values from Cloud Storage. You can also import feature values from BigQuery or a Pandas dataframe.\n"
       ]
     },
     {
@@ -988,7 +1025,7 @@
       "source": [
         "### Read one entity per request\n",
         "\n",
-        "With the Python SDK, it is easy to read feature values of one entity. By default, the SDK will return the  latest value of each feature, meaning the feature values with the most recent  timestamp.\n",
+        "With the Vertex AI SDK, it is easy to read feature values of one entity. By default, the SDK will return the  latest value of each feature, meaning the feature values with the most recent  timestamp.\n",
         "\n",
         "To read feature values, specify the entity type ID and features to read. By default all the features of an entity type will be selected. The response will output and display the selected entity type ID and the selected feature values as a Pandas dataframe."
       ]