migration: experiments

* migration: experiments

* migration: experiments

* debug: experiments

.cloud-build/requirements.txt

@@ -11,4 +11,3 @@ google-cloud-storage
 google-cloud-build
 ratemate
 GitPython
-google-api-core==2.10

notebooks/community/matching_engine/matching_engine_for_indexing.ipynb

@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# Copyright 2021 Google LLC\n",
+        "# Copyright 2023 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",
@@ -24,6 +24,7 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "JAPoU8Sm5E6e"
@@ -32,20 +33,28 @@
         "<table align=\"left\">\n",
         "\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/master/notebooks/community/matching_engine/matching_engine_for_indexing.ipynb\">\n",
-        "      Run in Google Cloud Notebooks\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/matching_engine/matching_engine_for_indexing.ipynb\">\n",
+        "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\">\n",
+        "      Run in Colab\n",
         "    </a>\n",
         "  </td>\n",
         "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/community/matching_engine/matching_engine_for_indexing.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/matching_engine/matching_engine_for_indexing.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/main/notebooks/community/matching_engine/matching_engine_for_indexing.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>"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "tvgnzT1CKxrO"
@@ -53,25 +62,49 @@
       "source": [
         "## Overview\n",
         "\n",
-        "This example demonstrates how to use the GCP ANN Service. It is a high scale, low latency solution, to find similar vectors (or more specifically \"embeddings\") for a large corpus. Moreover, it is a fully managed offering, further reducing operational overhead. It is built upon [Approximate Nearest Neighbor (ANN) technology](https://ai.googleblog.com/2020/07/announcing-scann-efficient-vector.html) developed by Google Research.\n",
-        "\n",
-        "### Dataset\n",
-        "\n",
-        "The dataset used for this tutorial is the [GloVe dataset](https://nlp.stanford.edu/projects/glove/).\n",
-        "\n",
+        "This example demonstrates how to use Vertex AI Matching Engine. It is a high scale, low latency solution, to find similar vectors (or more specifically \"embeddings\") for a large corpus. Moreover, it is a fully managed offering, further reducing operational overhead. It is built upon [Approximate Nearest Neighbor (ANN) technology](https://ai.googleblog.com/2020/07/announcing-scann-efficient-vector.html) developed by Google Research."
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "56e5f9699c6c"
+      },
+      "source": [
         "### Objective\n",
         "\n",
         "In this notebook, you will learn how to create Approximate Nearest Neighbor (ANN) Index, query against indexes, and validate the performance of the index. \n",
         "\n",
         "The steps performed include:\n",
         "\n",
-        "* Create ANN Index and Brute Force Index\n",
+        "* Create a Vertex AI Matching Engine Index and Brute Force Index\n",
         "* Create an IndexEndpoint with VPC Network\n",
-        "* Deploy ANN Index and Brute Force Index\n",
-        "* Perform online query\n",
-        "* Compute recall\n",
-        "\n",
+        "* Deploy a Vertex AI Matching Engine Index and Brute Force Index\n",
+        "* Perform online queries\n",
+        "* Submit batch queries\n",
+        "* Compute recall metric"
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "0aaef374550b"
+      },
+      "source": [
+        "### Dataset\n",
         "\n",
+        "The dataset used for this tutorial is the [GloVe dataset](https://nlp.stanford.edu/projects/glove/)."
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "5e2eba58ad71"
+      },
+      "source": [
         "### Costs \n",
         "\n",
         "This tutorial uses billable components of Google Cloud:\n",
@@ -87,6 +120,7 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "S5zc4kbEiYCm"
@@ -94,79 +128,47 @@
       "source": [
         "## Before you begin\n",
         "\n",
-        "* **Prepare a VPC network**.  To reduce any network overhead that might lead to unnecessary increase in overhead latency, it is best to call the ANN endpoints from your VPC via a direct [VPC Peering](https://cloud.google.com/vertex-ai/docs/general/vpc-peering) connection. The following section describes how to setup a VPC Peering connection if you don't have one. This is a one-time initial setup task. You can also reuse existing VPC network and skip this section.\n",
-        "* **WARNING:** The match service gRPC API (to create online queries against your deployed index) has to be executed in a Google Cloud Notebook instance that is created with the following requirements:\n",
-        "  * **In the same region as where your ANN service is deployed** (for example, if you set `REGION = \"us-central1\"` as same as the tutorial, the notebook instance has to be in `us-central1`).\n",
-        "  * **Make sure you select the VPC network you created for ANN service** (instead of using the \"default\" one). That is, you will have to create the VPC network below and then create a new notebook instance that uses that VPC.  \n",
-        "  * If you run it in the colab or a Google Cloud Notebook instance in a different VPC network or region, the gRPC API will fail to peer the network (InactiveRPCError)."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "lW2LneA5mmmP"
-      },
-      "outputs": [],
-      "source": [
-        "PROJECT_ID = \"<your_project_id>\"  # @param {type:\"string\"}\n",
-        "NETWORK_NAME = \"ucaip-haystack-vpc-network\"  # @param {type:\"string\"}\n",
-        "PEERING_RANGE_NAME = \"ucaip-haystack-range\"\n",
+        "### Set up your Google Cloud project\n",
         "\n",
-        "# Create a VPC network\n",
-        "! gcloud compute networks create {NETWORK_NAME} --bgp-routing-mode=regional --subnet-mode=auto --project={PROJECT_ID}\n",
+        "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "# Add necessary firewall rules\n",
-        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-icmp --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow icmp\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",
-        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-internal --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow all --source-ranges 10.128.0.0/9\n",
+        "2. [Make sure that billing is enabled for your project](https://cloud.google.com/billing/docs/how-to/modify-project).\n",
         "\n",
-        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-rdp --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow tcp:3389\n",
+        "3. [Enable the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com).\n",
         "\n",
-        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-ssh --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow tcp:22\n",
-        "\n",
-        "# Reserve IP range\n",
-        "! gcloud compute addresses create {PEERING_RANGE_NAME} --global --prefix-length=16 --network={NETWORK_NAME} --purpose=VPC_PEERING --project={PROJECT_ID} --description=\"peering range for uCAIP Haystack.\"\n",
-        "\n",
-        "# Set up peering with service networking\n",
-        "! gcloud services vpc-peerings connect --service=servicenetworking.googleapis.com --network={NETWORK_NAME} --ranges={PEERING_RANGE_NAME} --project={PROJECT_ID}"
+        "4. If you are running this notebook locally, you need to install the [Cloud SDK](https://cloud.google.com/sdk)."
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
-        "id": "d3uj8x73nDX_"
-      },
-      "source": [
-        "* Authentication: `$ gcloud auth login` rerun this in Google Cloud Notebook terminal when you are logged out and need the credential again."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "i7EUnXsZhAGF"
+        "id": "4700b0e39c5d"
       },
       "source": [
         "### Installation\n",
         "\n",
-        "Download and install the latest (preview) version of the Vertex SDK for Python."
+        "Download and install the latest version of the Vertex AI SDK for Python."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "wyy5Lbnzg5fi"
+        "id": "014470c6a8de"
       },
       "outputs": [],
       "source": [
-        "! pip install -U git+https://github.com/googleapis/python-aiplatform.git@main-test --user"
+        "! pip install -U git+https://github.com/googleapis/python-aiplatform.git@main --user"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
-        "id": "irSMQn6gZ19l"
+        "id": "cf00462144f7"
       },
       "source": [
         "Install the `h5py` to prepare sample dataset, and the `grpcio-tools` for querying against the index. "
@@ -176,11 +178,15 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "-h5sqwOEZ5Yq"
+        "id": "3f3e45e5a1d1"
       },
       "outputs": [],
       "source": [
-        "! pip install -U grpcio-tools --user\n",
+        "! pip install protobuf==3.20.*\n",
+        "! pip install -U google-api-python-client==1.8.0 --user\n",
+        "! pip install -U grpcio-tools==1.47.0 --user\n",
+        "! pip install -U grpcio==1.47.0 --user\n",
+        "! pip install -U grpcio-status==1.47.0 --user\n",
         "! pip install -U h5py --user"
       ]
     },
@@ -199,7 +205,7 @@
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "EzrelQZ22IZj"
+        "id": "aa1d87bdc90b"
       },
       "outputs": [],
       "source": [
@@ -215,79 +221,216 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
-        "id": "BF1j6f9HApxa"
+        "id": "249da91c1011"
       },
       "source": [
-        "### Set up your Google Cloud project\n",
+        "### Set your project ID\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).\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, and Service Networking API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component,servicenetworking.googleapis.com).\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": "WReHDGG5g0XY"
-      },
-      "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`."
+        "**If you don't know your project ID**, try the following:\n",
+        "* Run `gcloud config list`.\n",
+        "* Run `gcloud projects list`.\n",
+        "* See the support page: [Locate the project ID](https://support.google.com/googleapi/answer/7014113)"
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "oM1iC_MfAts1"
+        "id": "10e0d2ee8c45"
       },
       "outputs": [],
       "source": [
-        "import os\n",
+        "PROJECT_ID = \"[your-project-id]\"  # @param {type:\"string\"}\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)"
+        "# Set the project id\n",
+        "! gcloud config set project {PROJECT_ID}"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
-        "id": "qJYoRfYng0XZ"
+        "id": "3fbfae3ff12a"
       },
       "source": [
-        "Otherwise, set your project ID here."
+        "### Set the region\n",
+        "\n",
+        "You can also change the `REGION` variable used by Vertex AI. Learn more about [Vertex AI regions](https://cloud.google.com/vertex-ai/docs/general/locations).\n",
+        "* **WARNING:** \n",
+        "    *  **Make sure to [choose a region where Vertex AI services are available](https://cloud.google.com/vertex-ai/docs/general/locations#available_regions).**\n",
+        "    *  **If you use Vertex Workbench, the Notebook instance needs to be in the same region where your Vertex AI Matching Engine is deployed.** (for example, if you set `REGION = \"us-central1\"` as same as the tutorial, the notebook instance has to be in `us-central1`)."
       ]
     },
     {
       "cell_type": "code",
       "execution_count": null,
       "metadata": {
-        "id": "riG_qUokg0XZ"
+        "id": "71c3fd82024e"
       },
       "outputs": [],
       "source": [
-        "if PROJECT_ID == \"\" or PROJECT_ID is None:\n",
-        "    PROJECT_ID = \"<your_project_id>\"  # @param {type:\"string\"}"
+        "REGION = \"us-central1\"  # @param {type: \"string\"}\n",
+        "\n",
+        "# Set the regions\n",
+        "! gcloud config set ai_platform/region {REGION}"
       ]
     },
     {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "60c5a0f69ad8"
+      },
+      "source": [
+        "### Authenticate your Google Cloud account\n",
+        "\n",
+        "Depending on your Jupyter environment, you may have to manually authenticate. Follow the relevant instructions below."
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "d118c95af93f"
+      },
+      "source": [
+        "**1. Vertex AI Workbench**\n",
+        "* Do nothing as you are already authenticated."
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "3035286fcdda"
+      },
+      "source": [
+        "**2. Local JupyterLab instance, uncomment and run:**"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "455882ec0f11"
+      },
+      "outputs": [],
+      "source": [
+        "# ! gcloud auth login"
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "5097f3233d53"
+      },
+      "source": [
+        "**3. Colab, uncomment and run:**"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "2b88e46ac2c8"
+      },
+      "outputs": [],
+      "source": [
+        "# from google.colab import auth\n",
+        "# auth.authenticate_user()"
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "fcdbb8929927"
+      },
+      "source": [
+        "**4. Service account or other**\n",
+        "* See how to grant Cloud Storage permissions to your service account at https://cloud.google.com/storage/docs/gsutil/commands/iam#ch-examples."
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "7c6eef70dfdb"
+      },
+      "source": [
+        "### Prepare a VPC network\n",
+        "\n",
+        "To reduce any network overhead that might lead to unnecessary increase in overhead latency, it is best to call the Vertex AI Matching Engine endpoints from your VPC via a direct [VPC Peering](https://cloud.google.com/vertex-ai/docs/general/vpc-peering) connection. The following section describes how to setup a VPC Peering connection if you don't have one. This is a one-time initial setup task. You can also reuse existing VPC network and skip this section.\n",
+        "\n",
+        "* **WARNING:** The match service gRPC API (to create online queries against your deployed index) has to be executed in a Google Cloud Notebook instance that is created with the following requirements:\n",
+        "    * **Make sure you select the VPC network you created for Vertex AI Matching Engine service** (instead of using the \"default\" one). That is, you will have to create the VPC network below and then create a new notebook instance that uses that VPC.  \n",
+        "    * If you run it in the colab or a Google Cloud Notebook instance in a different VPC network or region, the gRPC API will fail to peer the network (InactiveRPCError)."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "ab38a8cc634c"
+      },
+      "outputs": [],
+      "source": [
+        "NETWORK_NAME = \"ucaip-haystack-vpc-network\"  # @param {type:\"string\"}\n",
+        "PEERING_RANGE_NAME = \"ucaip-haystack-range\""
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "ec6bf3199835"
+      },
+      "outputs": [],
+      "source": [
+        "# Create a VPC network\n",
+        "! gcloud compute networks create {NETWORK_NAME} --bgp-routing-mode=regional --subnet-mode=auto --project={PROJECT_ID}\n",
+        "\n",
+        "# Add necessary firewall rules\n",
+        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-icmp --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow icmp\n",
+        "\n",
+        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-internal --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow all --source-ranges 10.128.0.0/9\n",
+        "\n",
+        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-rdp --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow tcp:3389\n",
+        "\n",
+        "! gcloud compute firewall-rules create {NETWORK_NAME}-allow-ssh --network {NETWORK_NAME} --priority 65534 --project {PROJECT_ID} --allow tcp:22\n",
+        "\n",
+        "# Reserve IP range\n",
+        "! gcloud compute addresses create {PEERING_RANGE_NAME} --global --prefix-length=16 --network={NETWORK_NAME} --purpose=VPC_PEERING --project={PROJECT_ID} --description=\"peering range for uCAIP Haystack.\""
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "ddbace09fe81"
+      },
+      "source": [
+        "Create the VPC Peering. If you are running this from Vertex AI Workbench it is possible you might need your notebook's instance service or user account to have the Service Networking Admin Role"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "d329aa3c54d3"
+      },
+      "outputs": [],
+      "source": [
+        "# Set up peering with service networking\n",
+        "! gcloud services vpc-peerings connect --service=servicenetworking.googleapis.com --network={NETWORK_NAME} --ranges={PEERING_RANGE_NAME} --project={PROJECT_ID}"
+      ]
+    },
+    {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "zgPO1eR3CYjk"
@@ -297,13 +440,11 @@
         "\n",
         "**The following steps are required, regardless of your notebook environment.**\n",
         "\n",
-        "Set the name of your Cloud Storage bucket below. It must be unique across all\n",
+        "Create a storage bucket to store intermediate artifacts such as datasets. Set the name of your Cloud Storage bucket below. It must be unique across all\n",
         "Cloud Storage buckets.\n",
         "\n",
-        "You may also change the `REGION` variable, which is used for operations\n",
-        "throughout the rest of this notebook. Make sure to [choose a region where Vertex AI services are\n",
-        "available](https://cloud.google.com/vertex-ai/docs/general/locations#available_regions). You may\n",
-        "not use a Multi-Regional Storage bucket for training with Vertex AI."
+        "* **WARNING:** \n",
+        "    * **You may not use a Multi-Regional Storage bucket for training with Vertex AI.**"
       ]
     },
     {
@@ -314,8 +455,7 @@
       },
       "outputs": [],
       "source": [
-        "BUCKET_NAME = \"gs://[your-bucket-name]\"  # @param {type:\"string\"}\n",
-        "REGION = \"us-central1\"  # @param {type:\"string\"}"
+        "BUCKET_NAME = \"gs://[your-bucket-name-unique]\"  # @param {type:\"string\"}"
       ]
     },
     {
@@ -328,10 +468,14 @@
       "source": [
         "from datetime import datetime\n",
         "\n",
-        "TIMESTAMP = datetime.now().strftime(\"%Y%m%d%H%M%S\")\n",
+        "UUID = datetime.now().strftime(\"%Y%m%d%H%M%S\")\n",
         "\n",
-        "if BUCKET_NAME == \"\" or BUCKET_NAME is None or BUCKET_NAME == \"gs://[your-bucket-name]\":\n",
-        "    BUCKET_NAME = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP"
+        "if (\n",
+        "    BUCKET_NAME == \"\"\n",
+        "    or BUCKET_NAME is None\n",
+        "    or BUCKET_NAME == \"gs://[your-bucket-name-unique]\"\n",
+        "):\n",
+        "    BUCKET_NAME = \"gs://\" + PROJECT_ID + \"aip-\" + UUID"
       ]
     },
     {
@@ -351,7 +495,7 @@
       },
       "outputs": [],
       "source": [
-        "! gsutil mb -l $REGION $BUCKET_NAME"
+        "! gsutil mb -l $REGION -p $PROJECT_ID $BUCKET_NAME"
       ]
     },
     {
@@ -416,10 +560,7 @@
       },
       "outputs": [],
       "source": [
-        "REGION = \"us-central1\"\n",
         "ENDPOINT = \"{}-aiplatform.googleapis.com\".format(REGION)\n",
-        "NETWORK_NAME = \"ucaip-haystack-vpc-network\"  # @param {type:\"string\"}\n",
-        "\n",
         "\n",
         "AUTH_TOKEN = !gcloud auth print-access-token\n",
         "PROJECT_NUMBER = !gcloud projects list --filter=\"PROJECT_ID:'{PROJECT_ID}'\" --format='value(PROJECT_NUMBER)'\n",
@@ -429,10 +570,7 @@
         "\n",
         "print(\"ENDPOINT: {}\".format(ENDPOINT))\n",
         "print(\"PROJECT_ID: {}\".format(PROJECT_ID))\n",
-        "print(\"REGION: {}\".format(REGION))\n",
-        "\n",
-        "!gcloud config set project {PROJECT_ID}\n",
-        "!gcloud config set ai_platform/region {REGION}"
+        "print(\"REGION: {}\".format(REGION))"
       ]
     },
     {
@@ -523,12 +661,13 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "QuVl8DrWG8NS"
       },
       "source": [
-        "Upload the training data to GCS."
+        "Upload the training data to Google Cloud Storage"
       ]
     },
     {
@@ -539,9 +678,9 @@
       },
       "outputs": [],
       "source": [
-        "# NOTE: Everything in this GCS DIR will be DELETED before uploading the data.\n",
+        "# NOTE: Everything in this Google Cloud Storage directory will be DELETED before uploading the data\n",
         "\n",
-        "! gsutil rm -rf {BUCKET_NAME}/*"
+        "! gsutil rm -raf {BUCKET_NAME}/** 2> /dev/null || true"
       ]
     },
     {
@@ -567,21 +706,23 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "mglUPwHpJH98"
       },
       "source": [
-        "## Create Indexes\n"
+        "## Create the indexes\n"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "qhIBCQ7dDSbW"
       },
       "source": [
-        "### Create ANN Index (for Production Usage)"
+        "### Create Vertex AI Matching Engine index (for production usage)"
       ]
     },
     {
@@ -597,6 +738,16 @@
         ")"
       ]
     },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "14e1ed031d66"
+      },
+      "source": [
+        "Set constants"
+      ]
+    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -611,14 +762,15 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "svLYiDf0OD2G"
       },
       "source": [
-        "Create the ANN index configuration:\n",
+        "#### Create the Vertex AI Matching Engine index configuration\n",
         "\n",
-        "Please read the documentation to understand the various configuration parameters that can be used to tune the index\n"
+        "Please read the [documentation](https://cloud.google.com/vertex-ai/docs/matching-engine/configuring-indexes) to understand the various configuration parameters that can be used to tune the index"
       ]
     },
     {
@@ -656,9 +808,9 @@
         "    }\n",
         ")\n",
         "\n",
-        "ann_index = {\n",
+        "matching_engine_index = {\n",
         "    \"display_name\": DISPLAY_NAME,\n",
-        "    \"description\": \"Glove 100 ANN index\",\n",
+        "    \"description\": \"Glove 100 Vertex AI Matching Engine Index\",\n",
         "    \"metadata\": struct_pb2.Value(struct_value=metadata),\n",
         "}"
       ]
@@ -671,7 +823,9 @@
       },
       "outputs": [],
       "source": [
-        "ann_index = index_client.create_index(parent=PARENT, index=ann_index)"
+        "matching_engine_index = index_client.create_index(\n",
+        "    parent=PARENT, index=matching_engine_index\n",
+        ")"
       ]
     },
     {
@@ -686,7 +840,7 @@
         "# This will take ~45 min.\n",
         "\n",
         "while True:\n",
-        "    if ann_index.done():\n",
+        "    if matching_engine_index.done():\n",
         "        break\n",
         "    print(\"Poll the operation to create index...\")\n",
         "    time.sleep(60)"
@@ -700,17 +854,18 @@
       },
       "outputs": [],
       "source": [
-        "INDEX_RESOURCE_NAME = ann_index.result().name\n",
+        "INDEX_RESOURCE_NAME = matching_engine_index.result().name\n",
         "INDEX_RESOURCE_NAME"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "kSsqZuyoA1SG"
       },
       "source": [
-        "### Create Brute Force Index (for Ground Truth)\n",
+        "### Create brute force index (for ground truth)\n",
         "\n",
         "The brute force index uses a naive brute force method to find the nearest neighbors. This method is not fast or efficient. Hence brute force indices are not recommended for production usage. They are to be used to find the \"ground truth\" set of neighbors, so that the \"ground truth\" set can be used to measure recall of the indices being tuned for production usage. To ensure an apples to apples comparison, the `distanceMeasureType` and `featureNormType`, `dimensions` of the brute force index should match those of the production indices being tuned.\n",
         "\n",
@@ -725,8 +880,6 @@
       },
       "outputs": [],
       "source": [
-        "from google.protobuf import *\n",
-        "\n",
         "algorithmConfig = struct_pb2.Struct(\n",
         "    fields={\"bruteForceConfig\": struct_pb2.Value(struct_value=struct_pb2.Struct())}\n",
         ")\n",
@@ -796,12 +949,13 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "mglUPwHpJH98"
       },
       "source": [
-        "## Update Indexes\n",
+        "## Update the indexes\n",
         "\n",
         "Create incremental data file.\n"
       ]
@@ -863,10 +1017,10 @@
         "    }\n",
         ")\n",
         "\n",
-        "ann_index = {\n",
+        "matching_engine_index = {\n",
         "    \"name\": INDEX_RESOURCE_NAME,\n",
         "    \"display_name\": DISPLAY_NAME,\n",
-        "    \"description\": \"Glove 100 ANN index\",\n",
+        "    \"description\": \"Glove 100 Vertex AI Matching Engine Index\",\n",
         "    \"metadata\": struct_pb2.Value(struct_value=metadata),\n",
         "}"
       ]
@@ -879,7 +1033,7 @@
       },
       "outputs": [],
       "source": [
-        "ann_index = index_client.update_index(index=ann_index)"
+        "matching_engine_index = index_client.update_index(index=matching_engine_index)"
       ]
     },
     {
@@ -894,7 +1048,7 @@
         "# This will take ~45 min.\n",
         "\n",
         "while True:\n",
-        "    if ann_index.done():\n",
+        "    if matching_engine_index.done():\n",
         "        break\n",
         "    print(\"Poll the operation to update index...\")\n",
         "    time.sleep(60)"
@@ -908,17 +1062,18 @@
       },
       "outputs": [],
       "source": [
-        "INDEX_RESOURCE_NAME = ann_index.result().name\n",
+        "INDEX_RESOURCE_NAME = matching_engine_index.result().name\n",
         "INDEX_RESOURCE_NAME"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "qV2xjAnDDObD"
       },
       "source": [
-        "## Create an IndexEndpoint with VPC Network"
+        "## Create an index endpoint with VPC network"
       ]
     },
     {
@@ -997,21 +1152,23 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "np2cgVuuIe9k"
       },
       "source": [
-        "## Deploy Indexes"
+        "## Deploy the indexes"
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "8Ew1UgcIIiJG"
       },
       "source": [
-        "### Deploy ANN Index"
+        "### Deploy a Vertex AI Matching Engine index"
       ]
     },
     {
@@ -1022,7 +1179,7 @@
       },
       "outputs": [],
       "source": [
-        "DEPLOYED_INDEX_ID = \"ann_glove_deployed\""
+        "DEPLOYED_INDEX_ID = \"matching_engine_glove_deployed\""
       ]
     },
     {
@@ -1033,13 +1190,23 @@
       },
       "outputs": [],
       "source": [
-        "deploy_ann_index = {\n",
+        "deploy_matching_engine_index = {\n",
         "    \"id\": DEPLOYED_INDEX_ID,\n",
         "    \"display_name\": DEPLOYED_INDEX_ID,\n",
         "    \"index\": INDEX_RESOURCE_NAME,\n",
         "}"
       ]
     },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "cb6d956d7419"
+      },
+      "source": [
+        "If errors occur with the next command wait some minutes for the index endpoint to be created and retry."
+      ]
+    },
     {
       "cell_type": "code",
       "execution_count": null,
@@ -1049,7 +1216,7 @@
       "outputs": [],
       "source": [
         "r = index_endpoint_client.deploy_index(\n",
-        "    index_endpoint=INDEX_ENDPOINT_NAME, deployed_index=deploy_ann_index\n",
+        "    index_endpoint=INDEX_ENDPOINT_NAME, deployed_index=deploy_matching_engine_index\n",
         ")"
       ]
     },
@@ -1082,12 +1249,13 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "RNZnXmO5AhDO"
       },
       "source": [
-        "### Deploy Brute Force Index"
+        "### Deploy brute force index"
       ]
     },
     {
@@ -1158,12 +1326,13 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "6LCGvBNvBd8D"
       },
       "source": [
-        "## Create Online Queries\n",
+        "## Create online queries\n",
         "\n",
         "After you built your indexes, you may query against the deployed index through the online querying gRPC API (Match service) within the virtual machine instances from the same region (for example 'us-central1' in this tutorial).  \n",
         "\n",
@@ -1178,7 +1347,15 @@
         "\n",
         "* Compile the protocal buffer (see below)\n",
         "* Obtain the index endpoint\n",
-        "* Use a code-generated stub to make the call, passing the parameter values"
+        "* Use a code-generated stub to make the call, passing the parameter values\n",
+        "\n",
+        "### Troubleshooting connectivity issues\n",
+        "\n",
+        "In case you have connectivity errors please perform the following:\n",
+        "\n",
+        "* Verify that the index endpoint, index, and VPC are all in the same Google Cloud project\n",
+        "* Verify that the index endpoint, index, and VPC are all in the same region and it is a valid (e.g. us-central1)\n",
+        "* Verify the Network does not have a firewall rule which denies all egress connections. Else, disable this rule or overwrite it with another rule that allows connection to the index endpoint IP"
       ]
     },
     {
@@ -1351,12 +1528,13 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "8wXTSgz1Bl0x"
       },
       "source": [
-        "Obtain the Private Endpoint: "
+        "Obtain the private endpoint: "
       ]
     },
     {
@@ -1521,12 +1699,13 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "_mNwdU9_B_Ez"
       },
       "source": [
-        "### Batch Query\n",
+        "## Submit a batch query\n",
         "\n",
         "You can run multiple queries in a single RPC call using the BatchMatch API:"
       ]
@@ -1764,18 +1943,20 @@
         "]\n",
         "\n",
         "batch_request = match_service_pb2.BatchMatchRequest()\n",
-        "batch_request_ann = match_service_pb2.BatchMatchRequest.BatchMatchRequestPerIndex()\n",
+        "batch_request_matching_engine = (\n",
+        "    match_service_pb2.BatchMatchRequest.BatchMatchRequestPerIndex()\n",
+        ")\n",
         "batch_request_brute_force = (\n",
         "    match_service_pb2.BatchMatchRequest.BatchMatchRequestPerIndex()\n",
         ")\n",
-        "batch_request_ann.deployed_index_id = DEPLOYED_INDEX_ID\n",
+        "batch_request_matching_engine.deployed_index_id = DEPLOYED_INDEX_ID\n",
         "batch_request_brute_force.deployed_index_id = DEPLOYED_BRUTE_FORCE_INDEX_ID\n",
         "for query in queries:\n",
-        "    batch_request_ann.requests.append(get_request(query, DEPLOYED_INDEX_ID))\n",
+        "    batch_request_matching_engine.requests.append(get_request(query, DEPLOYED_INDEX_ID))\n",
         "    batch_request_brute_force.requests.append(\n",
         "        get_request(query, DEPLOYED_BRUTE_FORCE_INDEX_ID)\n",
         "    )\n",
-        "batch_request.requests.append(batch_request_ann)\n",
+        "batch_request.requests.append(batch_request_matching_engine)\n",
         "batch_request.requests.append(batch_request_brute_force)\n",
         "\n",
         "response = stub.BatchMatch(batch_request)\n",
@@ -1783,14 +1964,15 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "_mNwdU9_B_Ez"
       },
       "source": [
-        "### Compute Recall\n",
+        "### Compute the recall metric\n",
         "\n",
-        "Use deployed brute force Index as the ground truth to calculate the recall of ANN Index:"
+        "Use the deployed brute force index as the ground truth to calculate the recall of the Vertex AI Matching Engine index:"
       ]
     },
     {
@@ -1835,6 +2017,7 @@
       ]
     },
     {
+      "attachments": {},
       "cell_type": "markdown",
       "metadata": {
         "id": "TpV-iwP9qw9c"
@@ -1844,7 +2027,18 @@
         "\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",
-        "You can also manually delete resources that you created by running the following code."
+        "\n",
+        "Otherwise, you can delete the individual resources you created in this tutorial:"
+      ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "390c331dc7d9"
+      },
+      "source": [
+        "### Delete the Vertex AI Matching Engine resources"
       ]
     },
     {
@@ -1869,6 +2063,31 @@
       "source": [
         "index_endpoint_client.delete_index_endpoint(name=INDEX_ENDPOINT_NAME)"
       ]
+    },
+    {
+      "attachments": {},
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "ff14a85c85fb"
+      },
+      "source": [
+        "### Delete the Google Cloud Storage bucket"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "68d4781faac4"
+      },
+      "outputs": [],
+      "source": [
+        "import os\n",
+        "\n",
+        "delete_bucket = False\n",
+        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
+        "    ! gsutil -m rm -r $BUCKET_NAME"
+      ]
     }
   ],
   "metadata": {

notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/t5x_base_optimized_online_prediction.ipynb

@@ -40,18 +40,18 @@
       "source": [
         "<table align=\"left\">\n",
         "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/bert_optimized_online_prediction.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/t5x_base_optimized_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.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/bert_optimized_online_prediction.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/t5x_base_optimized_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/main/notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/bert_optimized_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/main/notebooks/community/vertex_endpoints/optimized_tensorflow_runtime/t5x_base_optimized_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",

notebooks/official/automl/README.md

@@ -14,7 +14,7 @@ The steps performed include the following:
 
 ```
 
-   Learn more about [Tabular classification](https://cloud.google.com/vertex-ai/docs/tabular-data/classification-regression/overview).
+   Learn more about [Classification for tabular data](https://cloud.google.com/vertex-ai/docs/tabular-data/classification-regression/overview).
 
 
 [Create, train, and deploy an AutoML text classification model](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl-text-classification.ipynb)
@@ -34,7 +34,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Text classification](https://cloud.google.com/vertex-ai/docs/text-data/classification/train-model).
+   Learn more about [Classification for text data](https://cloud.google.com/vertex-ai/docs/training-overview#classification_for_text).
 
 
 [Compare Vertex AI Forecasting and BigQuery ML ARIMA_PLUS](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl_forecasting_bqml_arima_plus_comparison.ipynb)
@@ -54,9 +54,7 @@ The steps performed are:
 
 ```
 
-   Learn more about [AutoML Forecasting](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/overview).
-
-   Learn more about [BQML Forecasting](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting-arima/overview).
+   Learn more about [BQML ARIMA+ forecasting for tabular data](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting-arima/overview).
 
 
 [AutoML Tabular Workflow pipelines](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/automl_tabular_on_vertex_pipelines.ipynb)
@@ -71,7 +69,26 @@ The steps performed are:
 
 ```
 
-   Learn more about [AutoML Tabular Workflows](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/e2e-automl).
+   Learn more about [Tabular Workflow for E2E AutoML](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/e2e-automl).
+
+
+[Get started with AutoML Training](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/get_started_automl_training.ipynb)
+
+```
+Learn how to use `AutoML` for training with `Vertex AI`.
+
+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
+
+```
+
+   Learn more about [Vertex AI for AutoML](https://cloud.google.com/vertex-ai/docs/start/automl-users).
 
 
 [AutoML training hierarchical forecasting for batch prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_forecasting_hierarchical_batch.ipynb)
@@ -90,7 +107,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Forecasting](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/overview).
+   Learn more about [Hierarchical forecasting for tabular data](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/hierarchical).
 
 
 [AutoML training image object detection model for batch prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_image_object_detection_batch.ipynb)
@@ -107,7 +124,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Image](https://cloud.google.com/vertex-ai/docs/image-data/object-detection/train-model).
+   Learn more about [Object detection for image data](https://cloud.google.com/vertex-ai/docs/training-overview#object_detection_for_images).
 
 
 [AutoML tabular forecasting model for batch prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_tabular_forecasting_batch.ipynb)
@@ -124,7 +141,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Forecasting](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/tutorials-samples).
+   Learn more about [Forecasting for tabular data](https://cloud.google.com/vertex-ai/docs/tabular-data/forecasting/overview).
 
 
 [AutoML training tabular regression model for batch prediction using BigQuery](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_tabular_regression_batch_bq.ipynb)
@@ -143,7 +160,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Tabular](https://cloud.google.com/vertex-ai/docs/training-overview#tabular_data).
+   Learn more about [Regression for tabular data](https://cloud.google.com/vertex-ai/docs/tabular-data/classification-regression/overview).
 
 
 [AutoML training tabular regression model for online prediction using BigQuery](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_tabular_regression_online_bq.ipynb)
@@ -162,7 +179,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Tabular](https://cloud.google.com/vertex-ai/docs/training-overview#tabular_data).
+   Learn more about [Regression for tabular data](https://cloud.google.com/vertex-ai/docs/tabular-data/classification-regression/overview).
 
 
 [AutoML training text entity extraction model for online prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_text_entity_extraction_online.ipynb)
@@ -181,7 +198,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Text](https://cloud.google.com/vertex-ai/docs/text-data/entity-extraction/train-model).
+   Learn more about [Entity extraction for text data](https://cloud.google.com/vertex-ai/docs/training-overview#entity_extraction_for_text).
 
 
 [Training an AutoML text sentiment analysis model for online predictions](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_text_sentiment_analysis_online.ipynb)
@@ -201,7 +218,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Text](https://cloud.google.com/vertex-ai/docs/text-data/sentiment-analysis/train-model).
+   Learn more about [Sentiment analysis for text data](https://cloud.google.com/vertex-ai/docs/training-overview#sentiment_analysis_for_text).
 
 
 [AutoML training video action recognition model for batch prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_video_action_recognition_batch.ipynb)
@@ -218,7 +235,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Video](https://cloud.google.com/vertex-ai/docs/video-data/action-recognition/train-model).
+   Learn more about [Action recognition for video data](https://cloud.google.com/vertex-ai/docs/training-overview#action_recognition_for_videos).
 
 
 [AutoML training video classification model for batch prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_video_classification_batch.ipynb)
@@ -235,7 +252,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Video](https://cloud.google.com/vertex-ai/docs/video-data/classification/train-model).
+   Learn more about [Classification for video data](https://cloud.google.com/vertex-ai/docs/training-overview#classification_for_videos).
 
 
 [AutoML training video object tracking model for batch prediction](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/automl/sdk_automl_video_object_tracking_batch.ipynb)
@@ -252,5 +269,5 @@ The steps performed include:
 
 ```
 
-   Learn more about [AutoML Video](https://cloud.google.com/vertex-ai/docs/video-data/object-tracking/train-model).
+   Learn more about [Object tracking for video data](https://cloud.google.com/vertex-ai/docs/training-overview#object_tracking_for_videos).
 

notebooks/official/bigquery_ml/README.md

@@ -15,5 +15,25 @@ The steps performed include:
 
 ```
 
-   Learn more about [BigQuery ML](https://cloud.google.com/bigquery-ml/docs/introduction).
+   Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml).
+
+
+[Get started with BigQuery ML Training](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/bigquery_ml/get_started_with_bqml_training.ipynb)
+
+```
+Learn how to use `BigQueryML` for training with `Vertex AI`.
+
+The steps performed include:
+
+- Create a local BigQuery table in your project
+- Train a BigQuery ML model
+- Evaluate the BigQuery ML model
+- Export the BigQuery ML model as a cloud model
+- Upload the exported model as a `Vertex AI Model` resource
+- Hyperparameter tune a BigQuery ML model with `Vertex AI Vizier`
+- Automatically register a BigQuery ML model to `Vertex AI Model Registry`
+
+```
+
+   Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml).
 

notebooks/official/bigquery_ml/get_started_with_bqml_training.ipynb

@@ -61,7 +61,6 @@
       "source": [
         "## Overview\n",
         "\n",
-        "\n",
         "This tutorial demonstrates how to use Vertex AI in production. This tutorial covers get started with BigQuery ML training.\n",
         "\n",
         "Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml)."
@@ -155,7 +154,8 @@
         "! pip3 install --upgrade pyarrow \\\n",
         "                        google-cloud-aiplatform \\\n",
         "                        google-cloud-bigquery \\\n",
-        "                        google-cloud-bigquery-storage $USER_FLAG -q"
+        "                        google-cloud-bigquery-storage \\\n",
+        "                        db-dtypes $USER_FLAG -q"
       ]
     },
     {

notebooks/official/experiments/README.md

@@ -55,3 +55,36 @@ The steps performed include:
 
    Learn more about [Vertex AI Pipelines](https://cloud.google.com/vertex-ai/docs/pipelines/introduction).
 
+
+[Get started with Vertex AI Experiments](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/experiments/get_started_with_vertex_experiments.ipynb)
+
+```
+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
+    - Log parameters and metrics
+    - Create artifact lineage
+    - Visualize the experiment results
+    - Execute a second run
+    - Compare the two runs in the experiment
+- Cloud (`Vertex AI`) Training
+    - Within the training script:
+        - Create an experiment
+        - Log parameters and metrics
+        - Create artifact lineage
+    - Create a `Vertex AI Training` custom job
+    - Execute the custom job
+    - Visualize the experiment results
+
+```
+
+   Learn more about [Vertex AI Experiments](https://cloud.google.com/vertex-ai/docs/experiments/intro-vertex-ai-experiments).
+
+   Learn more about [Vertex ML Metadata](https://cloud.google.com/vertex-ai/docs/ml-metadata).
+
+   Learn more about [Vertex AI Training](https://cloud.google.com/vertex-ai/docs/training/custom-training).
+

notebooks/official/model_monitoring/README.md

@@ -15,6 +15,128 @@ The steps performed include:
    Learn more about [Vertex AI Model Monitoring for batch predictions](https://cloud.google.com/vertex-ai/docs/model-monitoring/model-monitoring-batch-predictions).
 
 
+[Vertex AI Model Monitoring for AutoML tabular models](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/get_started_with_model_monitoring_automl.ipynb)
+
+```
+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.
+
+```
+
+   Learn more about [Vertex AI Model Monitoring](https://cloud.google.com/vertex-ai/docs/model-monitoring).
+
+
+[Vertex AI Model Monitoring for batch prediction in AutoML image models](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/get_started_with_model_monitoring_automl_image_batch.ipynb)
+
+```
+Learn how to use `Vertex AI Model Monitoring` with `Vertex AI Batch Prediction` with an AutoML image classification model to detect an out of distribution image.
+
+The steps performed include:
+
+1. Train an AutoML image classification model.
+2. Submit a batch prediction containing both in and out of distribution images.
+3. Use Model Monitoring to calculate anomaly score on each image.
+4. Identify the images in the batch prediction request that are out of distribution.
+
+```
+
+   Learn more about [Vertex AI Model Monitoring](https://cloud.google.com/vertex-ai/docs/model-monitoring).
+
+
+[Vertex AI Model Monitoring for custom tabular models](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/get_started_with_model_monitoring_custom.ipynb)
+
+```
+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.
+
+```
+
+   Learn more about [Vertex AI Model Monitoring](https://cloud.google.com/vertex-ai/docs/model-monitoring).
+
+
+[Vertex AI Model Monitoring for custom tabular models with TensorFlow Serving container](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/get_started_with_model_monitoring_custom_tf_serving.ipynb)
+
+```
+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.
+
+```
+
+   Learn more about [Vertex AI Model Monitoring](https://cloud.google.com/vertex-ai/docs/model-monitoring).
+
+
+[Vertex AI Model Monitoring for setup for tabular models](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/get_started_with_model_monitoring_setup.ipynb)
+
+```
+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.
+
+```
+
+   Learn more about [Vertex AI Model Monitoring](https://cloud.google.com/vertex-ai/docs/model-monitoring).
+
+
+[Vertex AI Model Monitoring for XGBoost models](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/get_started_with_model_monitoring_xgboost.ipynb)
+
+```
+Learn to use the `Vertex AI Model Monitoring` service to detect feature skew and drift in the input predict requests for XGBoost models.
+
+The steps performed include:
+
+- Download a pre-trained XGBoost 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:
+  - drift detection only -- no access to training data.
+  - predefine the input schema to map feature alias names to the unnamed array input to the model.
+- Generate synthetic prediction requests for drift.
+
+```
+
+   Learn more about [Vertex AI Model Monitoring](https://cloud.google.com/vertex-ai/docs/model-monitoring).
+
+
 [Vertex AI Model Monitoring with Explainable AI Feature Attributions](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/model_monitoring/model_monitoring.ipynb)
 
 ```

notebooks/official/model_registry/README.md

@@ -17,5 +17,5 @@ The steps performed include:
 
    Learn more about [Vertex AI Model Registry](https://cloud.google.com/vertex-ai/docs/model-registry/introduction).
 
-   Learn more about [BigQuery ML](https://cloud.google.com/bigquery-ml/docs/introduction).
+   Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml).
 

notebooks/official/pipelines/README.md

@@ -285,3 +285,24 @@ The steps performed include:
 
    Learn more about [Vertex AI Pipelines](https://cloud.google.com/vertex-ai/docs/pipelines/introduction).
 
+
+[BQML and AutoML - Experimenting with Vertex AI](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/pipelines/rapid_prototyping_bqml_automl.ipynb)
+
+```
+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.
+
+```
+
+   Learn more about [AutoML components](https://cloud.google.com/vertex-ai/docs/pipelines/vertex-automl-component).
+
+   Learn more about [BigQuery ML components](https://cloud.google.com/vertex-ai/docs/pipelines/bigqueryml-component).
+

notebooks/official/tabnet/README.md

@@ -12,9 +12,7 @@ The steps performed are:
 
 ```
 
-   Learn more about [Vertex AI TabNet](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/tabnet).
-
-   Learn more about [Vertex Explainable AI](https://cloud.google.com/vertex-ai/docs/explainable-ai/overview).
+   Learn more about [Tabular Workflow for TabNet](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/tabnet).
 
 
 [Vertex AI TabNet](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/tabnet/tabnet_vertex_tutorial.ipynb)
@@ -32,7 +30,5 @@ The steps performed are:
 
 ```
 
-   Learn more about [Vertex AI TabNet](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/tabnet).
-
-   Learn more about [Vertex AI Hyperparameter Tuning](https://cloud.google.com/vertex-ai/docs/training/hyperparameter-tuning-overview).
+   Learn more about [Tabular Workflow for TabNet](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/tabnet).
 

notebooks/official/tabular_workflows/README.md

@@ -11,9 +11,7 @@ The steps performed include:
 
 ```
 
-   Learn more about [Vertex AI TabNet](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/tabnet).
-
-   Learn more about [Vertex AI Pipelines](https://cloud.google.com/vertex-ai/docs/pipelines/introduction).
+   Learn more about [Tabular Workflow for TabNet](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/tabnet).
 
 
 [Wide & Deep Pipeline](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/tabular_workflows/wide_and_deep_on_vertex_pipelines.ipynb)
@@ -28,7 +26,5 @@ The steps performed include:
 
 ```
 
-   Learn more about [Vertex AI Wide & Deep](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/wide-and-deep).
-
-   Learn more about [Vertex AI Pipelines](https://cloud.google.com/vertex-ai/docs/pipelines/introduction).
+   Learn more about [Tabular Workflow for Wide & Deep](https://cloud.google.com/vertex-ai/docs/tabular-data/tabular-workflows/wide-and-deep).
 

notebooks/official/training/README.md

@@ -1,4 +1,22 @@
 
+[Get started with Vertex AI Distributed Training](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/training/get_started_with_vertex_distributed_training.ipynb)
+
+```
+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.
+
+```
+
+   Learn more about [Vertex AI Distributed Training](https://cloud.google.com/vertex-ai/docs/training/distributed-training).
+
+
 [Run hyperparameter tuning for a TensorFlow model](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/training/hyperparameter_tuning_tensorflow.ipynb)
 
 ```

notebooks/official/training/get_started_with_vertex_distributed_training.ipynb

@@ -61,8 +61,7 @@
       "source": [
         "## Overview\n",
         "\n",
-        "\n",
-        "This tutorial demonstrates how to use Vertex in production. This tutorial covers get started with Vertex Distributed Training. \n",
+        "This tutorial demonstrates how to use the Vertex AI Python client library to do distrbuted training of a TensorFlow model.\n",
         "\n",
         "*Note:* There are incompatibilities between Colab and Docker and the Docker section may not work until resolved by the platform.\n",
         "\n",
@@ -77,7 +76,7 @@
       "source": [
         "### Objective\n",
         "\n",
-        "In this tutorial, you learn how to use `Vertex AI Distributed Training` for when training with `Vertex AI`.\n",
+        "In this tutorial, you learn how to use `Vertex AI Distributed Training` when training with `Vertex AI`.\n",
         "\n",
         "This tutorial uses the following Google Cloud ML services:\n",
         "\n",

notebooks/official/workbench/README.md

@@ -83,7 +83,7 @@ The steps performed include:
 
    Learn more about [Vertex AI Workbench](https://cloud.google.com/vertex-ai/docs/workbench/introduction).
 
-   Learn more about [BigQuery](https://cloud.google.com/bigquery).
+   Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml).
 
 
 [Build a fraud detection model on Vertex AI](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/workbench/fraud_detection/fraud-detection-model.ipynb)
@@ -127,7 +127,7 @@ The steps performed include:
 
    Learn more about [Vertex AI Workbench](https://cloud.google.com/vertex-ai/docs/workbench/introduction).
 
-   Learn more about [BigQuery ML](https://cloud.google.com/bigquery-ml/docs/managing-models-vertex).
+   Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml).
 
 
 [Inventory prediction on ecommerce data using Vertex AI](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/workbench/inventory-prediction/inventory_prediction.ipynb)
@@ -194,7 +194,7 @@ The steps performed include:
 
    Learn more about [Vertex AI Workbench](https://cloud.google.com/vertex-ai/docs/workbench/introduction).
 
-   Learn more about [BigQuery ML](https://cloud.google.com/bigquery-ml/docs/managing-models-vertex).
+   Learn more about [BigQuery ML](https://cloud.google.com/vertex-ai/docs/beginner/bqml).
 
 
 [Sentiment Analysis using AutoML Natural Language and Vertex AI](https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/workbench/sentiment_analysis/Sentiment_Analysis.ipynb)