update: touchups

2026-09-27 07:31:58 +00:00 · 2022-06-23 16:56:20 +00:00 · 2022-06-23 16:46:46 +00:00
30 changed files with 821 additions and 16768 deletions
@@ -256,7 +256,6 @@ def get_changed_notebooks(
    else:
        print(f"Looking for all notebooks.")
        notebooks = subprocess.check_output(["git", "ls-files"] + test_paths)
-        notebooks = notebooks.decode("utf-8").split("\n")

    notebooks = [notebook for notebook in notebooks if notebook.endswith(".ipynb")]
    notebooks = [notebook for notebook in notebooks if len(notebook) > 0]
@@ -10,37 +10,19 @@ steps:
    entrypoint: /bin/sh
    args:
    - -c
-    - python3 .cloud-build/CheckPythonVersion.py
-  # Create a virtual environment
-  - name: ${_PYTHON_IMAGE}
-    entrypoint: /bin/sh
-    args:
-    - -c
-    - python3 -m venv workspace/env
+    - 'python3 .cloud-build/CheckPythonVersion.py'
  # Install Python dependencies
-  - name: ${_PYTHON_IMAGE}
-    entrypoint: /bin/sh
-    args:
-    - -c 
-    - . workspace/env/bin/activate &&
-      python3 -m pip install -U pip &&
-      python3 -m pip install -U -r .cloud-build/requirements.txt
-  # pip freeze
  - name: ${_PYTHON_IMAGE}
    entrypoint: /bin/sh
    args:
    - -c
-    - |
-      . workspace/env/bin/activate &&
-      python3 -m pip freeze    
+    - 'python3 -m pip install -U pip && python3 -m pip install -U --user -r .cloud-build/requirements.txt'
  # Install Python dependencies and run testing script
  - name: ${_PYTHON_IMAGE}
    entrypoint: /bin/sh
    args:
    - -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}"
+    - 'python3 -m pip install -U pip && python3 -m pip freeze && python3 .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
@@ -4,47 +4,29 @@ steps:
    entrypoint: /bin/sh
    args:
    - -c
-    - gcloud config list
+    - 'gcloud config list'
  # Check the Python version
  - name: ${_PYTHON_IMAGE}
    entrypoint: /bin/sh
    args:
    - -c
-    - python3 .cloud-build/CheckPythonVersion.py
+    - 'python3 .cloud-build/CheckPythonVersion.py'
  # Fetch full repo for diff purposes
  - name: gcr.io/cloud-builders/git
    args: [fetch, --unshallow]
-  # Create a virtual environment
-  - name: ${_PYTHON_IMAGE}
-    entrypoint: /bin/sh
-    args:
-    - -c
-    - python3 -m venv workspace/env
  # Install Python dependencies
-  - name: ${_PYTHON_IMAGE}
-    entrypoint: /bin/sh
-    args:
-    - -c 
-    - . workspace/env/bin/activate &&
-      python3 -m pip install -U pip &&
-      python3 -m pip install -U -r .cloud-build/requirements.txt
-  # pip freeze
  - name: ${_PYTHON_IMAGE}
    entrypoint: /bin/sh
    args:
    - -c
-    - |
-      . workspace/env/bin/activate &&
-      python3 -m pip freeze
+    - 'python3 -m pip install -U pip && python3 -m pip install -U --user -r .cloud-build/requirements.txt'
  # Install Python dependencies and run testing script
  # TODO: Only pass in private_pool_id if it is set
  - name: ${_PYTHON_IMAGE}
    entrypoint: /bin/sh
    args:
    - -c
-    - | 
-      . workspace/env/bin/activate &&
-      python3 .cloud-build/execute_changed_notebooks_cli.py --test_paths_file "${_TEST_PATHS_FILE}" --base_branch "${_FORCED_BASE_BRANCH}" --container_uri ${_PYTHON_IMAGE} --staging_bucket ${_GCS_STAGING_BUCKET}  --artifacts_bucket ${_GCS_STAGING_BUCKET}/executed_notebooks/PR_${_PR_NUMBER}/BUILD_${BUILD_ID} --variable_project_id ${PROJECT_ID} --variable_region ${_GCP_REGION} `if [ ! -z "${_PRIVATE_POOL_NAME}" ]; then echo "--private_pool_id ${_PRIVATE_POOL_NAME}"; fi`
+    - 'python3 -m pip install -U pip && python3 -m pip freeze && python3 .cloud-build/execute_changed_notebooks_cli.py --test_paths_file "${_TEST_PATHS_FILE}" --base_branch "${_FORCED_BASE_BRANCH}" --container_uri ${_PYTHON_IMAGE} --staging_bucket ${_GCS_STAGING_BUCKET}  --artifacts_bucket ${_GCS_STAGING_BUCKET}/executed_notebooks/PR_${_PR_NUMBER}/BUILD_${BUILD_ID} --variable_project_id ${PROJECT_ID} --variable_region ${_GCP_REGION} `if [ ! -z "${_PRIVATE_POOL_NAME}" ]; then echo "--private_pool_id ${_PRIVATE_POOL_NAME}"; fi`'
    env:
    - 'IS_TESTING=1'
 timeout: 86400s
@@ -18,7 +18,6 @@
 /sdk/pytorch_lightning_custom_container_training.ipynb @brianchunkang
 /tensorboard @yfang1
 /feature_store @nayaknishant @morgandu
-/prediction @googleapis/vertex-prediction-team
 /vertex_endpoints/tf_hub_obj_detection/deploy_tfhub_object_detection_on_vertex_endpoints.ipynb @entrpn
 /vertex_endpoints/nvidia-triton/nvidia-triton-custom-container-prediction.ipynb @RajeshThallam
 /vertex_endpoints/optimized_tensorflow_runtime @vlasenkoalexey
@@ -97,9 +97,11 @@
      "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. \n",
-        "  * The following section describes how to setup a VPC Peering connection if you don't have one. \n",
-        "  * This is a one-time initial setup task. You can also reuse existing VPC network and skip this section."
+        "* **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 MatchingIndexEndpoint.match method (to create online queries against your deployed index) has to be executed in a Vertex AI Workbench 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 Vertex AI Workbench notebook instance in a different VPC network or region, the gRPC API will fail to peer the network (InactiveRPCError)."
      ]
    },
    {
@@ -110,11 +112,11 @@
      },
      "outputs": [],
      "source": [
-        "PROJECT_ID = \"python-docs-samples-tests\"  # @param {type:\"string\"}\n",
+        "PROJECT_ID = \"<your_project_id>\"  # @param {type:\"string\"}\n",
        "\n",
-        "NETWORK_NAME = \"ann-vpc-network\"  # @param {type:\"string\"}\n",
+        "NETWORK_NAME = \"my-vpc-network\"  # @param {type:\"string\"}\n",
        "\n",
-        "PEERING_RANGE_NAME = \"ann-haystack-range\""
+        "PEERING_RANGE_NAME = \"my-haystack-range\""
      ]
    },
    {
@@ -141,7 +143,6 @@
        "! gcloud compute addresses create {PEERING_RANGE_NAME} --global --prefix-length=16 --network={NETWORK_NAME} --purpose=VPC_PEERING --project={PROJECT_ID} --description=\"peering range\"\n",
        "\n",
        "# Set up peering with service networking\n",
-        "# Your account must have the \"Compute Network Admin\" role to run the following.\n",
        "! gcloud services vpc-peerings connect --service=servicenetworking.googleapis.com --network={NETWORK_NAME} --ranges={PEERING_RANGE_NAME} --project={PROJECT_ID}"
      ]
    },
@@ -154,20 +155,6 @@
        "* Authentication: Rerun the `gcloud auth login` command in the Vertex AI Workbench notebook terminal when you are logged out and need the credential again."
      ]
    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "d5de53b31bf1"
-      },
-      "source": [
-        "## Make sure the following cells are run from inside the VPC network that you created in the previous step.\n",
-        "\n",
-        "* **WARNING:** The MatchingIndexEndpoint.match method (to create online queries against your deployed index) has to be executed in a Vertex AI Workbench 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 Vertex AI Workbench notebook instance in a different VPC network or region, \"Create Online Queries\" section will fail."
-      ]
-    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -284,7 +271,7 @@
      "source": [
        "import os\n",
        "\n",
-        "PROJECT_ID = \"python-docs-samples-tests\"\n",
+        "PROJECT_ID = \"\"\n",
        "\n",
        "# Get your Google Cloud project ID from gcloud\n",
        "if not os.getenv(\"IS_TESTING\"):\n",
@@ -747,28 +734,6 @@
        "INDEX_RESOURCE_NAME"
      ]
    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "0f1a9fbecabb"
-      },
-      "outputs": [],
-      "source": [
-        "Using the resource name, you can retrieve an existing MatchingEngineIndex."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "1ddb70647d98"
-      },
-      "outputs": [],
-      "source": [
-        "tree_ah_index = aiplatform.MatchingEngineIndex(INDEX_RESOURCE_NAME)"
-      ]
-    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -777,7 +742,7 @@
      "source": [
        "### 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 `dimensions` of the brute force index should match those of the production indices being tuned.\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",
        "Create the brute force index configuration:"
      ]
@@ -812,19 +777,6 @@
        "INDEX_BRUTE_FORCE_RESOURCE_NAME"
      ]
    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "865fcad494d7"
-      },
-      "outputs": [],
-      "source": [
-        "brute_force_index = aiplatform.MatchingEngineIndex(\n",
-        "    \"projects/1012616486416/locations/us-central1/indexes/6738176690918260736\"\n",
-        ")"
-      ]
-    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -989,7 +941,7 @@
      },
      "outputs": [],
      "source": [
-        "DEPLOYED_INDEX_ID = f\"tree_ah_glove_deployed_{TIMESTAMP}\""
+        "DEPLOYED_INDEX_ID = \"tree_ah_glove_deployed\""
      ]
    },
    {
@@ -1024,7 +976,7 @@
      },
      "outputs": [],
      "source": [
-        "DEPLOYED_BRUTE_FORCE_INDEX_ID = f\"glove_brute_force_deployed_{TIMESTAMP}\""
+        "DEPLOYED_BRUTE_FORCE_INDEX_ID = \"glove_brute_force_deployed\""
      ]
    },
    {
@@ -1071,13 +1023,344 @@
      "outputs": [],
      "source": [
        "# Test query\n",
+        "query = [\n",
+        "    -0.11333,\n",
+        "    0.48402,\n",
+        "    0.090771,\n",
+        "    -0.22439,\n",
+        "    0.034206,\n",
+        "    -0.55831,\n",
+        "    0.041849,\n",
+        "    -0.53573,\n",
+        "    0.18809,\n",
+        "    -0.58722,\n",
+        "    0.015313,\n",
+        "    -0.014555,\n",
+        "    0.80842,\n",
+        "    -0.038519,\n",
+        "    0.75348,\n",
+        "    0.70502,\n",
+        "    -0.17863,\n",
+        "    0.3222,\n",
+        "    0.67575,\n",
+        "    0.67198,\n",
+        "    0.26044,\n",
+        "    0.4187,\n",
+        "    -0.34122,\n",
+        "    0.2286,\n",
+        "    -0.53529,\n",
+        "    1.2582,\n",
+        "    -0.091543,\n",
+        "    0.19716,\n",
+        "    -0.037454,\n",
+        "    -0.3336,\n",
+        "    0.31399,\n",
+        "    0.36488,\n",
+        "    0.71263,\n",
+        "    0.1307,\n",
+        "    -0.24654,\n",
+        "    -0.52445,\n",
+        "    -0.036091,\n",
+        "    0.55068,\n",
+        "    0.10017,\n",
+        "    0.48095,\n",
+        "    0.71104,\n",
+        "    -0.053462,\n",
+        "    0.22325,\n",
+        "    0.30917,\n",
+        "    -0.39926,\n",
+        "    0.036634,\n",
+        "    -0.35431,\n",
+        "    -0.42795,\n",
+        "    0.46444,\n",
+        "    0.25586,\n",
+        "    0.68257,\n",
+        "    -0.20821,\n",
+        "    0.38433,\n",
+        "    0.055773,\n",
+        "    -0.2539,\n",
+        "    -0.20804,\n",
+        "    0.52522,\n",
+        "    -0.11399,\n",
+        "    -0.3253,\n",
+        "    -0.44104,\n",
+        "    0.17528,\n",
+        "    0.62255,\n",
+        "    0.50237,\n",
+        "    -0.7607,\n",
+        "    -0.071786,\n",
+        "    0.0080131,\n",
+        "    -0.13286,\n",
+        "    0.50097,\n",
+        "    0.18824,\n",
+        "    -0.54722,\n",
+        "    -0.42664,\n",
+        "    0.4292,\n",
+        "    0.14877,\n",
+        "    -0.0072514,\n",
+        "    -0.16484,\n",
+        "    -0.059798,\n",
+        "    0.9895,\n",
+        "    -0.61738,\n",
+        "    0.054169,\n",
+        "    0.48424,\n",
+        "    -0.35084,\n",
+        "    -0.27053,\n",
+        "    0.37829,\n",
+        "    0.11503,\n",
+        "    -0.39613,\n",
+        "    0.24266,\n",
+        "    0.39147,\n",
+        "    -0.075256,\n",
+        "    0.65093,\n",
+        "    -0.20822,\n",
+        "    -0.17456,\n",
+        "    0.53571,\n",
+        "    -0.16537,\n",
+        "    0.13582,\n",
+        "    -0.56016,\n",
+        "    0.016964,\n",
+        "    0.1277,\n",
+        "    0.94071,\n",
+        "    -0.22608,\n",
+        "    -0.021106,\n",
+        "]\n",
+        "\n",
        "response = my_index_endpoint.match(\n",
-        "    deployed_index_id=DEPLOYED_INDEX_ID, queries=test[:1], num_neighbors=NUM_NEIGHBOURS\n",
+        "    deployed_index_id=DEPLOYED_INDEX_ID, queries=[query], num_neighbors=NUM_NEIGHBOURS\n",
        ")\n",
        "\n",
        "response"
      ]
    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "_mNwdU9_B_Ez"
+      },
+      "source": [
+        "### Batch Query\n",
+        "\n",
+        "You can run multiple queries in a single match call:"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "A0XL0PJ1GoM9"
+      },
+      "outputs": [],
+      "source": [
+        "# Test query\n",
+        "queries = [\n",
+        "    [\n",
+        "        -0.11333,\n",
+        "        0.48402,\n",
+        "        0.090771,\n",
+        "        -0.22439,\n",
+        "        0.034206,\n",
+        "        -0.55831,\n",
+        "        0.041849,\n",
+        "        -0.53573,\n",
+        "        0.18809,\n",
+        "        -0.58722,\n",
+        "        0.015313,\n",
+        "        -0.014555,\n",
+        "        0.80842,\n",
+        "        -0.038519,\n",
+        "        0.75348,\n",
+        "        0.70502,\n",
+        "        -0.17863,\n",
+        "        0.3222,\n",
+        "        0.67575,\n",
+        "        0.67198,\n",
+        "        0.26044,\n",
+        "        0.4187,\n",
+        "        -0.34122,\n",
+        "        0.2286,\n",
+        "        -0.53529,\n",
+        "        1.2582,\n",
+        "        -0.091543,\n",
+        "        0.19716,\n",
+        "        -0.037454,\n",
+        "        -0.3336,\n",
+        "        0.31399,\n",
+        "        0.36488,\n",
+        "        0.71263,\n",
+        "        0.1307,\n",
+        "        -0.24654,\n",
+        "        -0.52445,\n",
+        "        -0.036091,\n",
+        "        0.55068,\n",
+        "        0.10017,\n",
+        "        0.48095,\n",
+        "        0.71104,\n",
+        "        -0.053462,\n",
+        "        0.22325,\n",
+        "        0.30917,\n",
+        "        -0.39926,\n",
+        "        0.036634,\n",
+        "        -0.35431,\n",
+        "        -0.42795,\n",
+        "        0.46444,\n",
+        "        0.25586,\n",
+        "        0.68257,\n",
+        "        -0.20821,\n",
+        "        0.38433,\n",
+        "        0.055773,\n",
+        "        -0.2539,\n",
+        "        -0.20804,\n",
+        "        0.52522,\n",
+        "        -0.11399,\n",
+        "        -0.3253,\n",
+        "        -0.44104,\n",
+        "        0.17528,\n",
+        "        0.62255,\n",
+        "        0.50237,\n",
+        "        -0.7607,\n",
+        "        -0.071786,\n",
+        "        0.0080131,\n",
+        "        -0.13286,\n",
+        "        0.50097,\n",
+        "        0.18824,\n",
+        "        -0.54722,\n",
+        "        -0.42664,\n",
+        "        0.4292,\n",
+        "        0.14877,\n",
+        "        -0.0072514,\n",
+        "        -0.16484,\n",
+        "        -0.059798,\n",
+        "        0.9895,\n",
+        "        -0.61738,\n",
+        "        0.054169,\n",
+        "        0.48424,\n",
+        "        -0.35084,\n",
+        "        -0.27053,\n",
+        "        0.37829,\n",
+        "        0.11503,\n",
+        "        -0.39613,\n",
+        "        0.24266,\n",
+        "        0.39147,\n",
+        "        -0.075256,\n",
+        "        0.65093,\n",
+        "        -0.20822,\n",
+        "        -0.17456,\n",
+        "        0.53571,\n",
+        "        -0.16537,\n",
+        "        0.13582,\n",
+        "        -0.56016,\n",
+        "        0.016964,\n",
+        "        0.1277,\n",
+        "        0.94071,\n",
+        "        -0.22608,\n",
+        "        -0.021106,\n",
+        "    ],\n",
+        "    [\n",
+        "        -0.99544,\n",
+        "        -2.3651,\n",
+        "        -0.24332,\n",
+        "        -1.0321,\n",
+        "        0.42052,\n",
+        "        -1.1817,\n",
+        "        -0.16451,\n",
+        "        -1.683,\n",
+        "        0.49673,\n",
+        "        -0.27258,\n",
+        "        -0.025397,\n",
+        "        0.34188,\n",
+        "        1.5523,\n",
+        "        1.3532,\n",
+        "        0.33297,\n",
+        "        -0.0056677,\n",
+        "        -0.76525,\n",
+        "        0.49587,\n",
+        "        1.2211,\n",
+        "        0.83394,\n",
+        "        -0.20031,\n",
+        "        -0.59657,\n",
+        "        0.38485,\n",
+        "        -0.23487,\n",
+        "        -1.0725,\n",
+        "        0.95856,\n",
+        "        0.16161,\n",
+        "        -1.2496,\n",
+        "        1.6751,\n",
+        "        0.73899,\n",
+        "        0.051347,\n",
+        "        -0.42702,\n",
+        "        0.16257,\n",
+        "        -0.16772,\n",
+        "        0.40146,\n",
+        "        0.29837,\n",
+        "        0.96204,\n",
+        "        -0.36232,\n",
+        "        -0.47848,\n",
+        "        0.78278,\n",
+        "        0.14834,\n",
+        "        1.3407,\n",
+        "        0.47834,\n",
+        "        -0.39083,\n",
+        "        -1.037,\n",
+        "        -0.24643,\n",
+        "        -0.75841,\n",
+        "        0.7669,\n",
+        "        -0.37363,\n",
+        "        0.52741,\n",
+        "        0.018563,\n",
+        "        -0.51301,\n",
+        "        0.97674,\n",
+        "        0.55232,\n",
+        "        1.1584,\n",
+        "        0.73715,\n",
+        "        1.3055,\n",
+        "        -0.44743,\n",
+        "        -0.15961,\n",
+        "        0.85006,\n",
+        "        -0.34092,\n",
+        "        -0.67667,\n",
+        "        0.2317,\n",
+        "        1.5582,\n",
+        "        1.2308,\n",
+        "        -0.62213,\n",
+        "        -0.032801,\n",
+        "        0.1206,\n",
+        "        -0.25899,\n",
+        "        -0.02756,\n",
+        "        -0.52814,\n",
+        "        -0.93523,\n",
+        "        0.58434,\n",
+        "        -0.24799,\n",
+        "        0.37692,\n",
+        "        0.86527,\n",
+        "        0.069626,\n",
+        "        1.3096,\n",
+        "        0.29975,\n",
+        "        -1.3651,\n",
+        "        -0.32048,\n",
+        "        -0.13741,\n",
+        "        0.33329,\n",
+        "        -1.9113,\n",
+        "        -0.60222,\n",
+        "        -0.23921,\n",
+        "        0.12664,\n",
+        "        -0.47961,\n",
+        "        -0.89531,\n",
+        "        0.62054,\n",
+        "        0.40869,\n",
+        "        -0.08503,\n",
+        "        0.6413,\n",
+        "        -0.84044,\n",
+        "        -0.74325,\n",
+        "        -0.19426,\n",
+        "        0.098722,\n",
+        "        0.32648,\n",
+        "        -0.67621,\n",
+        "        -0.62692,\n",
+        "    ],\n",
+        "]"
+      ]
+    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -1086,7 +1369,7 @@
      "source": [
        "### Compute Recall\n",
        "\n",
-        "Use the deployed brute force Index as the ground truth to calculate the recall of ANN Index. Note that you can run multiple queries in a single match call."
+        "Use deployed brute force Index as the ground truth to calculate the recall of ANN Index:"
      ]
    },
    {
@@ -1119,20 +1402,18 @@
      "outputs": [],
      "source": [
        "# Calculate recall by determining how many neighbors were correctly retrieved as compared to the brute-force option.\n",
-        "recalled_neighbors = 0\n",
+        "correct_neighbors = 0\n",
        "for tree_ah_neighbors, brute_force_neighbors in zip(\n",
        "    tree_ah_response_test, brute_force_response_test\n",
        "):\n",
        "    tree_ah_neighbor_ids = [neighbor.id for neighbor in tree_ah_neighbors]\n",
        "    brute_force_neighbor_ids = [neighbor.id for neighbor in brute_force_neighbors]\n",
        "\n",
-        "    recalled_neighbors += len(\n",
+        "    correct_neighbors += len(\n",
        "        set(tree_ah_neighbor_ids).intersection(brute_force_neighbor_ids)\n",
        "    )\n",
        "\n",
-        "recall = recalled_neighbors / len(\n",
-        "    [neighbor for neighbors in brute_force_response_test for neighbor in neighbors]\n",
-        ")\n",
+        "recall = correct_neighbors / (len(test) * NUM_NEIGHBOURS)\n",
        "\n",
        "print(\"Recall: {}\".format(recall))"
      ]
@@ -88,17 +88,6 @@ The steps performed include:
 - Cancel a data labeling job.
 ```

-[Get Started with Vision API and Vertex AI Datasets](get_started_with_visionapi_and_vertex_datasets.ipynb)
-
-```
-The steps performed include:
-
- Using Vision API to perform Optical Character Recognition (OCR) to extract text from PDF files.
- Processing the results and saving them to text files.
- Generating a Vertex AI Dataset import file.
- Creating a new unlabelled text entity extraction Vertex AI Dataset resource in Vertex AI.
-```
-
 ### E2E Stage Example

 [Stage 1: Data Management](mlops_data_management.ipynb)
@@ -35,36 +35,18 @@ The second stage in MLOps is experimenting in developing one or more baseline mo

 ### Get Started

-[Get Started with Logging](get_started_with_logging.ipynb)
+[Get Started with Vertex Experiments and Vertex ML Metadata](get_started_vertex_experiments.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 Experiments and Vertex ML Metadata](get_started_vertex_experiments.ipynb)
-
-```
-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
+- Create a Vertex AI `Experiment` resource.
+- Instantiate an experiment run.
+- Log parameters for the run.
+- Log metrics for the run.
+- Display the logged experiment run.
 ```

 [Get Started with Vertex TensorBoard](get_started_vertex_tensorboard.ipynb)
@@ -40,7 +40,7 @@
        "  </td>\n",
        "    <td>\n",
        "        <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage2/get_started_bqml_training.ipynb\">\n",
-        "        <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\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",
@@ -1209,7 +1209,7 @@
        "\n",
        "You need to set some additional IAM permissions for BigQuery ML to automatically upload and register the model after training. Depending on your service account, the setting of the permissions below may fail. In this case, we recommend executing the permissions in a Cloud Shell.\n",
        "\n",
-        "Learn more about [Setting permissions for Model Registry](https://cloud.google.com/bigquery-ml/docs/managing-models-vertex)\n"
+        "Learn more about [Setting permissions for Model Registry](https://cloud.devsite.corp.google.com/bigquery-ml/docs/managing-models-vertex\n"
      ]
    },
    {
@@ -1,684 +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 2 : experimentation: get started with Logging\n",
-        "\n",
-        "<table align=\"left\">\n",
-        "  <td>\n",
-        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage2/get_started_with_logging.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/stage2/get_started_with_logging.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/get_started_with_logging.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 Logging."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "objective:mlops,stage2,get_started_vertex_experiments"
-      },
-      "source": [
-        "### Objective\n",
-        "\n",
-        "In this tutorial, you learn how to use Python and Cloud logging awhen training with `Vertex AI`.\n",
-        "\n",
-        "This tutorial uses the following Google Cloud ML services:\n",
-        "\n",
-        "- `Cloud Logging`\n",
-        "\n",
-        "The steps performed include:\n",
-        "\n",
-        "- Use Python logging to log training configuration/results locally.\n",
-        "- Use Google Cloud Logging to log training configuration/results in cloud storage."
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "recommendation:mlops,stage2,logging"
-      },
-      "source": [
-        "### Recommendations\n",
-        "\n",
-        "When doing E2E MLOps on Google Cloud, the following are some of the best practices for logging data when experimenting or formally training a model.\n",
-        "\n",
-        "#### Python Logging\n",
-        "\n",
-        "Use Python's logging package when doing ad-hoc training locally.\n",
-        "\n",
-        "#### Cloud Logging\n",
-        "\n",
-        "Use `Google Cloud Logging` when doing training on the cloud.\n",
-        "\n",
-        "#### Experiments\n",
-        "\n",
-        "Use Vertex AI Experiments in conjunction with logging when performing experiments to compare results for different experiment configurations.\n",
-        "\n",
-        "### Costs\n",
-        "This tutorial uses billable components of Google Cloud:\n",
-        "\n",
-        "- Vertex AI\n",
-        "\n",
-        "Learn about [Vertex AI pricing](https://cloud.google.com/vertex-ai/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 following packages 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",
-        "! pip3 install --upgrade google-cloud-logging $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": [
-        "### 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, Cloud Storage and Cloud Logging APIs](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com,compute_component,storage_component,logging).\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.\n",
-        "\n",
-        "\n",
-        "#### 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": "f3bd8c0d0469"
-      },
-      "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": "e0953a00668e"
-      },
-      "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": "setup_vars"
-      },
-      "source": [
-        "### Set up variables\n",
-        "\n",
-        "Next, set up some variables used throughout the tutorial.\n",
-        "### Import libraries"
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "import_aip:mbsdk"
-      },
-      "outputs": [],
-      "source": [
-        "import logging\n",
-        "\n",
-        "import google.cloud.aiplatform as aiplatform"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "init_aip:mbsdk,region"
-      },
-      "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,region"
-      },
-      "outputs": [],
-      "source": [
-        "aiplatform.init(project=PROJECT_ID, location=REGION)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "python_logging"
-      },
-      "source": [
-        "## Python Logging\n",
-        "\n",
-        "The Python logging package is widely used for logging within Python scripts. Commonly used features:\n",
-        "\n",
-        "- Set logging levels.\n",
-        "- Send log output to console.\n",
-        "- Send log output to a file.\n",
-        "\n",
-        "### Logging Levels in Python Logging\n",
-        "\n",
-        "The logging levels in order (from least to highest) and each level inclusive of the previous level are :\n",
-        "\n",
-        "1. Informational\n",
-        "2. Warnings\n",
-        "3. Errors\n",
-        "4. Debugging\n",
-        "\n",
-        "By default, the logging level is set to error level.\n",
-        "\n",
-        "### Logging output to console\n",
-        "\n",
-        "By default, the Python logging package outputs to the console. Note, in the example the debug log message is not outputted since the default logging level is set to error."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "python_logging"
-      },
-      "outputs": [],
-      "source": [
-        "def logging_examples():\n",
-        "    logging.info(\"Model training started...\")\n",
-        "    logging.warning(\"Using older version of package ...\")\n",
-        "    logging.error(\"Training was terminated ...\")\n",
-        "    logging.debug(\"Hyperparameters were ...\")\n",
-        "\n",
-        "\n",
-        "logging_examples()"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "python_logging_level"
-      },
-      "source": [
-        "### Setting logging level\n",
-        "\n",
-        "To set the logging level, you get the logging handler using `getLogger()`. You can have multiple logging handles. When `getLogger()` is called without any arguments, it gets the default handler named ROOT. With the handler, you set the logging level with the method `setLevel()`."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "python_logging_level"
-      },
-      "outputs": [],
-      "source": [
-        "logging.getLogger().setLevel(logging.DEBUG)\n",
-        "\n",
-        "logging_examples()"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "python_logging_remove"
-      },
-      "source": [
-        "### Clearing handlers\n",
-        "\n",
-        "At times, you may desire to reconfigure your logging. A common practice in this case is to first remove all existing logging handles for a fresh start."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "python_logging_remove"
-      },
-      "outputs": [],
-      "source": [
-        "for handler in logging.root.handlers[:]:\n",
-        "    logging.root.removeHandler(handler)"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "python_logging_file"
-      },
-      "source": [
-        "### Output to a local file\n",
-        "\n",
-        "You can preserve your logging output to a file that is local to where the Python script is running with the method `BasicConfig()`, that takes the following parameters:\n",
-        "\n",
-        "- `filename`: The file path to the local file to write the log output to.\n",
-        "- `level`: Sets the level of logging that is written to the logging file.\n",
-        "\n",
-        "*Note:* You cannot use a Cloud Storage bucket as the output file."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "python_logging_file"
-      },
-      "outputs": [],
-      "source": [
-        "logging.basicConfig(filename=\"mylog.log\", level=logging.DEBUG)\n",
-        "\n",
-        "logging_examples()\n",
-        "\n",
-        "! cat mylog.log"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "cloud_logging"
-      },
-      "source": [
-        "## Logging with Google Cloud Logging\n",
-        "\n",
-        "You can preserve and retrieve your logging output to `Google Cloud Logging` service. Commonly used features:\n",
-        "\n",
-        "- Set logging levels.\n",
-        "- Send log output to storage.\n",
-        "- Retrieve log output from storage.\n",
-        "\n",
-        "### Logging Levels in Cloud Logging\n",
-        "\n",
-        "The logging levels in order (from least to highest) are, with each level inclusive of the previous level:\n",
-        "\n",
-        "1. Informational\n",
-        "2. Warnings\n",
-        "3. Errors\n",
-        "4. Debugging\n",
-        "\n",
-        "By default, the logging level is set to warning level.\n",
-        "\n",
-        "### Configurable and storing log data.\n",
-        "\n",
-        "To use the `Google Cloud Logging` service, you do the following steps:\n",
-        "\n",
-        "1. Create a client to the service.\n",
-        "2. Obtain a handler for the service.\n",
-        "3. Create a logger instance and set logging level.\n",
-        "4. Attach logger instance to the service.\n",
-        "\n",
-        "Learn more about [Logging client libraries](https://cloud.google.com/logging/docs/reference/libraries)."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "cloud_logging"
-      },
-      "outputs": [],
-      "source": [
-        "import google.cloud.logging\n",
-        "from google.cloud.logging.handlers import CloudLoggingHandler\n",
-        "\n",
-        "# Connect to the Cloud Logging service\n",
-        "cl_client = google.cloud.logging.Client(project=PROJECT_ID)\n",
-        "handler = CloudLoggingHandler(cl_client, name=\"mylog\")\n",
-        "\n",
-        "# Create a logger instance and logging level\n",
-        "cloud_logger = logging.getLogger(\"cloudLogger\")\n",
-        "cloud_logger.setLevel(logging.INFO)\n",
-        "\n",
-        "# Attach the logger instance to the service.\n",
-        "cloud_logger.addHandler(handler)\n",
-        "\n",
-        "# Log something\n",
-        "cloud_logger.error(\"bad news\")"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "cloud_logging_write"
-      },
-      "source": [
-        "### Logging output\n",
-        "\n",
-        "Logging output at specific levels is identical to Python logging with respect to method and method names. The only difference is that you use your instance of the cloud logger in place of logging."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "cloud_logging_write"
-      },
-      "outputs": [],
-      "source": [
-        "cloud_logger.info(\"Model training started...\")\n",
-        "cloud_logger.warning(\"Using older version of package ...\")\n",
-        "cloud_logger.error(\"Training was terminated ...\")\n",
-        "cloud_logger.debug(\"Hyperparameters were ...\")"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "cloud_logging_list"
-      },
-      "source": [
-        "### Get logging entries\n",
-        "\n",
-        "To get the logged output, you:\n",
-        "\n",
-        "1. Retrieve the log handle to the service.\n",
-        "2. Using the handle, call the method `list_entries()`.\n",
-        "3. Iterate through the entries."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "cloud_logging_list"
-      },
-      "outputs": [],
-      "source": [
-        "logger = cl_client.logger(\"mylog\")\n",
-        "\n",
-        "for entry in logger.list_entries():\n",
-        "    timestamp = entry.timestamp.isoformat()\n",
-        "    print(\"* {}: {}: {}\".format(timestamp, entry.severity, entry.payload))"
-      ]
-    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "cleanup:mbsdk"
-      },
-      "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."
-      ]
-    }
-  ],
-  "metadata": {
-    "colab": {
-      "name": "get_started_with_logging.ipynb",
-      "toc_visible": true
-    },
-    "kernelspec": {
-      "display_name": "Python 3",
-      "name": "python3"
-    }
-  },
-  "nbformat": 4,
-  "nbformat_minor": 0
-}
@@ -177,21 +177,6 @@ The steps performed in this tutorial include:
 - Execute the `Vertex AI Pipeline`.
 ```

-
-[Get Started with Vertex AI Model Registry](get_started_with_model_registry.ipynb)
-
-```
-The steps performed in this tutorial 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`
- List all versions of a `Model` resource.
- Change the default version of a `Model` resource`
- Deploy the default version of a `Model` resource.
- Delete a model version from a `Model` resource.
- Delete a `Model` resource along with all model versions.
-```
-
 ### E2E Stage Example

 [Stage 3: Formalization](mlops_formalization.ipynb)
@@ -40,7 +40,7 @@
        "  </td>\n",
        "  <td>\n",
        "        <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage4/get_started_with_vertex_ml_metadata_and_automl.ipynb\">\n",
-        "        <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Colab logo\"> Run in Colab\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",
@@ -255,30 +255,6 @@
        "! gcloud config set project $PROJECT_ID"
      ]
    },
-    {
-      "cell_type": "markdown",
-      "metadata": {
-        "id": "23988890fef6"
-      },
-      "source": [
-        "#### Get your project number\n",
-        "\n",
-        "Now that the project ID is set, you get your corresponding project number."
-      ]
-    },
-    {
-      "cell_type": "code",
-      "execution_count": null,
-      "metadata": {
-        "id": "2d6950574e1d"
-      },
-      "outputs": [],
-      "source": [
-        "shell_output = ! gcloud projects list --filter=\"PROJECT_ID:'{PROJECT_ID}'\" --format='value(PROJECT_NUMBER)'\n",
-        "PROJECT_NUMBER = shell_output[0]\n",
-        "print(\"Project Number:\", PROJECT_NUMBER)"
-      ]
-    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -754,7 +730,7 @@
        "\n",
        "artifact_item = Artifact(\n",
        "    display_name=\"flowers_\" + TIMESTAMP,\n",
-        "    uri=f\"https://{REGION}-aiplatform.googleapis.com/v1/\" + dataset.resource_name,\n",
+        "    uri=\"https://us-central1-aiplatform.googleapis.com/v1/\" + dataset.resource_name,\n",
        "    name=dataset.resource_name,\n",
        "    schema_title=\"google.VertexDataset\",\n",
        "    metadata={\"data_type\": \"image\", \"annotation_type\": \"image classification\"},\n",
@@ -762,7 +738,7 @@
        ")\n",
        "\n",
        "artifact_dataset = clients[\"metadata\"].create_artifact(\n",
-        "    parent=f\"projects/{PROJECT_NUMBER}/locations/{REGION}/metadataStores/default\",\n",
+        "    parent=\"projects/759209241365/locations/us-central1/metadataStores/default\",\n",
        "    artifact=artifact_item,\n",
        "    artifact_id=dataset.resource_name.split(\"/\")[-1],\n",
        ")\n",
@@ -893,7 +869,7 @@
      "source": [
        "artifact_item = Artifact(\n",
        "    display_name=\"flowers_\" + TIMESTAMP,\n",
-        "    uri=f\"https://{REGION}-aiplatform.googleapis.com/v1/\" + model.resource_name,\n",
+        "    uri=\"https://us-central1-aiplatform.googleapis.com/v1/\" + model.resource_name,\n",
        "    name=model.resource_name,\n",
        "    schema_title=\"google.VertexModel\",\n",
        "    metadata={\"model_type\": \"image classification\"},\n",
@@ -901,7 +877,7 @@
        ")\n",
        "\n",
        "artifact_model = clients[\"metadata\"].create_artifact(\n",
-        "    parent=f\"projects/{PROJECT_NUMBER}/locations/{REGION}/metadataStores/default\",\n",
+        "    parent=\"projects/759209241365/locations/us-central1/metadataStores/default\",\n",
        "    artifact=artifact_item,\n",
        "    artifact_id=model.resource_name.split(\"/\")[-1],\n",
        ")\n",
@@ -965,7 +941,7 @@
      "source": [
        "artifact_item = Artifact(\n",
        "    display_name=\"flowers_\" + TIMESTAMP,\n",
-        "    uri=f\"https://{REGION}-aiplatform.googleapis.com/v1/\"\n",
+        "    uri=\"https://us-central1-aiplatform.googleapis.com/v1/\"\n",
        "    + model_evaluations[0].resource_name,\n",
        "    name=model_evaluations[0].resource_name,\n",
        "    schema_title=\"system.SlicedClassificationMetrics\",\n",
@@ -974,7 +950,7 @@
        ")\n",
        "\n",
        "artifact_metrics = clients[\"metadata\"].create_artifact(\n",
-        "    parent=f\"projects/{PROJECT_NUMBER}/locations/{REGION}/metadataStores/default\",\n",
+        "    parent=\"projects/759209241365/locations/us-central1/metadataStores/default\",\n",
        "    artifact=artifact_item,\n",
        "    artifact_id=model_evaluations[0].resource_name.split(\"/\")[-1],\n",
        ")\n",
@@ -1035,7 +1011,7 @@
      "source": [
        "artifact_item = Artifact(\n",
        "    display_name=\"flowers_\" + TIMESTAMP,\n",
-        "    uri=f\"https://{REGION}-aiplatform.googleapis.com/v1/\" + endpoint.resource_name,\n",
+        "    uri=\"https://us-central1-aiplatform.googleapis.com/v1/\" + endpoint.resource_name,\n",
        "    name=endpoint.resource_name,\n",
        "    schema_title=\"google.VertexEndpoint\",\n",
        "    metadata={\"param\": \"value\"},\n",
@@ -1043,7 +1019,7 @@
        ")\n",
        "\n",
        "artifact_endpoint = clients[\"metadata\"].create_artifact(\n",
-        "    parent=f\"projects/{PROJECT_NUMBER}/locations/{REGION}/metadataStores/default\",\n",
+        "    parent=\"projects/759209241365/locations/us-central1/metadataStores/default\",\n",
        "    artifact=artifact_item,\n",
        "    artifact_id=endpoint.resource_name.split(\"/\")[-1],\n",
        ")\n",
@@ -1082,7 +1058,7 @@
        "from google.cloud.aiplatform_v1beta1.types import Execution\n",
        "\n",
        "execution = clients[\"metadata\"].create_execution(\n",
-        "    parent=f\"projects/{PROJECT_NUMBER}/locations/{REGION}/metadataStores/default\",\n",
+        "    parent=\"projects/759209241365/locations/us-central1/metadataStores/default\",\n",
        "    execution=Execution(\n",
        "        display_name=\"AutoML training and deployment\",\n",
        "        schema_title=\"system.ContainerExecution\",\n",
@@ -1181,7 +1157,7 @@
        "from google.cloud.aiplatform_v1beta1.types import Context\n",
        "\n",
        "context = clients[\"metadata\"].create_context(\n",
-        "    parent=f\"projects/{PROJECT_NUMBER}/locations/{REGION}/metadataStores/default\",\n",
+        "    parent=\"projects/759209241365/locations/us-central1/metadataStores/default\",\n",
        "    context=Context(\n",
        "        display_name=\"flowers_\" + TIMESTAMP,\n",
        "        schema_title=\"system.Pipeline\",\n",
@@ -29,7 +29,7 @@
        "id": "title"
      },
      "source": [
-        "# Vertex SDK: E2E ML on GCP: MLOps stage 4 : evaluation: get started with Vertex AI Explanations\n",
+        "# Vertex SDK: E2E ML on GCP: MLOps stage 4 : formalization: get started with Vertex AI Explanations\n",
        "\n",
        "<table align=\"left\">\n",
        "  <td>\n",
@@ -29,7 +29,7 @@
        "id": "title:generic,gcp"
      },
      "source": [
-        "# E2E ML on GCP: MLOps stage 5 : deployment: Get started with Vertex AI Endpoints\n",
+        "# E2E ML on GCP: MLOps stage 5 : Get started with Vertex AI Endpoints\n",
        "<table align=\"left\">\n",
        "  <td>\n",
        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/community/ml_ops/stage5/get_started_with_vertex_endpoints.ipynb\">\n",
@@ -171,6 +171,20 @@
        "! pip3 install --upgrade tensorflow $USER_FLAG -q"
      ]
    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "38379eb00a31"
+      },
+      "outputs": [],
+      "source": [
+        "# Temporary, until feature pushed to Pypi\n",
+        "! pip3 uninstall google-cloud-aiplatform -y\n",
+        "\n",
+        "! pip install --user git+https://github.com/googleapis/python-aiplatform.git@private-ep"
+      ]
+    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -12,7 +12,6 @@
 /migration @aferlitsch
 /explainabl_ai @aferlitsch
 /pipelines @aferlitsch
-/experiments @inardini

 /model_monitoring/model_monitoring.ipynb @mco-gh
 /ml_metadata/sdk-metric-parameter-tracking-for-custom-jobs.ipynb @jialuzh
@@ -24,4 +23,3 @@
 /pipelines/google_cloud_pipeline_components_bqml_text.ipynb @inardini
 /pipelines/google_cloud_pipelines_dataproc_tabular @inardini
 /automl/automl_forecasting_bqml_arima_plus_comparison.ipynb @TheMichaelHu
-/automl/automl_tabular_on_vertex_pipelines.ipynb @helinwang
@@ -43,7 +43,7 @@
        "    </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",
+        "    <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",
        "        <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",
@@ -61,7 +61,7 @@
        "\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",
+        "This notebook walks you through the major phases of building and using a text classification model on [Vertex AI](https://cloud.google.com/vertex-ai/docs/). \n",
        "\n",
        "### Dataset\n",
        "\n",
@@ -74,7 +74,7 @@
        "This tutorial uses the following Google Cloud ML services:\n",
        "\n",
        "- `AutoML Training`\n",
-        "- `Vertex AI Model` resource\n",
+        "- `Vertex AI Model resource`\n",
        "\n",
        "The steps performed include:\n",
        "\n",
@@ -192,7 +192,7 @@
        "if IS_WORKBENCH_NOTEBOOK:\n",
        "    USER_FLAG = \"--user\"\n",
        "\n",
-        "! pip3 install {USER_FLAG} --upgrade google-cloud-aiplatform google-cloud-storage jsonlines -q"
+        "! pip3 install {USER_FLAG} --upgrade google-cloud-aiplatform google-cloud-storage jsonlines"
      ]
    },
    {
@@ -536,7 +536,7 @@
        "id": "32c971919605"
      },
      "source": [
-        "## Create a `Dataset` resource and import your data\n",
+        "## Create a dataset and import your data\n",
        "\n",
        "The notebook uses the 'Happy Moments' dataset for demonstration purposes. You can change it to another text classification dataset that [conforms to the data preparation requirements](https://cloud.google.com/vertex-ai/docs/datasets/prepare-text#classification).\n",
        "\n",
@@ -584,7 +584,7 @@
      "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",
+        "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/us-central1/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"
      ]
@@ -33,21 +33,20 @@
        "\n",
        "<table align=\"left\">\n",
        "  <td>\n",
-        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/pipelines/custom_model_training_and_batch_prediction.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/pipelines/custom_model_training_and_batch_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/pipelines/custom_model_training_and_batch_prediction.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/pipelines/custom_model_training_and_batch_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://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/pipelines/custom_model_training_and_batch_prediction.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/notebooks/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/pipelines/custom_model_training_and_batch_prediction.ipynb\">\n",
        "      Open in Vertex AI Workbench\n",
-        "     </a>\n",
+        "    </a>\n",
        "  </td>\n",
        "</table>\n",
        "<br/><br/><br/>"
@@ -84,25 +83,14 @@
      "source": [
        "### Objective\n",
        "\n",
-        "In this tutorial, you learn to use `Vertex AI Pipelines` and `Google Cloud Pipeline Components` to build a custom model.\n",
-        "\n",
-        "\n",
-        "This tutorial uses the following Google Cloud ML services:\n",
-        "\n",
-        "- `Vertex AI Pipelines`\n",
-        "- `Google Cloud Pipeline Components`\n",
-        "- `Vertex AI Training`\n",
-        "- `Vertex AI Model` resource\n",
-        "- `Vertex AI Endpoint` resource\n",
+        "In this tutorial, you create a custom image classification model using Vertex AI Pipelines with pre-built Google Cloud Pipeline Components for custom training.\n",
        "\n",
        "The steps performed include:\n",
        "\n",
-        "- Create a KFP pipeline:\n",
-        "    - Train a custom model.\n",
-        "    - Upload the trained model as a `Model` resource.\n",
-        "    - Create an `Endpoint` resource.\n",
-        "    - Deploy the `Model` resource to the `Endpoint` resource.\n",
-        "    - Make a batch prediction request.\n",
+        "- Train a custom model.\n",
+        "- Upload the trained model as a `Model` resource.\n",
+        "- Create an `Endpoint` resource.\n",
+        "- Deploy the `Model` resource to the `Endpoint` resource.\n",
        "\n",
        "Learn more about [Google Cloud Pipeline Components](https://cloud.google.com/vertex-ai/docs/pipelines/build-pipeline)."
      ]
@@ -135,7 +123,7 @@
      "source": [
        "### Set up your local development environment\n",
        "\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",
+        "If you are using Colab or Google Cloud 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",
@@ -168,7 +156,7 @@
      "source": [
        "## Installation\n",
        "\n",
-        "Install the packages required for executing this notebook."
+        "Install the latest version of Vertex AI SDK for Python."
      ]
    },
    {
@@ -181,21 +169,63 @@
      "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",
+        "# Google Cloud Notebook\n",
+        "if os.path.exists(\"/opt/deeplearning/metadata/env_version\") or os.getenv(\"IS_TESTING\"):\n",
        "    USER_FLAG = \"--user\"\n",
+        "else:\n",
+        "    USER_FLAG = \"\"\n",
        "\n",
-        "! pip3 install --upgrade google-cloud-aiplatform {USER_FLAG} -q\n",
-        "! pip3 install -U google-cloud-storage {USER_FLAG} -q\n",
-        "! pip3 install {USER_FLAG} kfp google-cloud-pipeline-components --upgrade -q\n",
-        "\n",
+        "! pip3 install --upgrade google-cloud-aiplatform $USER_FLAG"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "install_storage"
+      },
+      "source": [
+        "Install the latest GA version of *google-cloud-storage* library as well."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "install_storage"
+      },
+      "outputs": [],
+      "source": [
+        "! pip3 install -U google-cloud-storage $USER_FLAG"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "install_gcpc"
+      },
+      "source": [
+        "Install the latest GA version of *google-cloud-pipeline-components* library as well."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "install_gcpc"
+      },
+      "outputs": [],
+      "source": [
+        "! pip3 install kfp google-cloud-pipeline-components --upgrade $USER_FLAG"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "b12be5c73a33"
+      },
+      "outputs": [],
+      "source": [
        "if os.getenv(\"IS_TESTING\"):\n",
        "    ! pip3 install --upgrade --force-reinstall $USER_FLAG tensorflow==2.5 kfp google-cloud-aiplatform google-cloud-storage google-cloud-pipeline-components"
      ]
@@ -359,30 +389,23 @@
      "source": [
        "### Authenticate your Google Cloud account\n",
        "\n",
-        "**If you are using Vertex AI Workbench Notebook**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Google Cloud Notebook**, your environment is already authenticated. Skip this step.\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",
+        "**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",
-        "1. In the Cloud Console, go to the [**Create service account key**\n",
-        "   page](https://console.cloud.google.com/apis/credentials/serviceaccountkey).\n",
+        "In the Cloud Console, go to the [Create service account key](https://console.cloud.google.com/apis/credentials/serviceaccountkey) page.\n",
        "\n",
-        "2. Click **Create service account**.\n",
+        "**Click Create service account**.\n",
        "\n",
-        "3. In the **Service account name** field, enter a name, and\n",
-        "   click **Create**.\n",
+        "In the **Service account name** field, enter a name, and 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",
+        "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",
        "\n",
-        "5. Click *Create*. A JSON file that contains your key downloads to your\n",
-        "local environment.\n",
+        "Click Create. A JSON file that contains your key downloads to your 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."
+        "Enter the path to your service account key as the GOOGLE_APPLICATION_CREDENTIALS variable in the cell below and run the cell."
      ]
    },
    {
@@ -401,11 +424,8 @@
        "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 on Google Cloud Notebook, then don't execute this code\n",
+        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\"):\n",
        "    if \"google.colab\" in sys.modules:\n",
        "        from google.colab import auth as google_auth\n",
        "\n",
@@ -453,9 +473,8 @@
      },
      "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_URI = \"gs://\" + BUCKET_NAME"
+        "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
+        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP"
      ]
    },
    {
@@ -533,16 +552,9 @@
        "    or SERVICE_ACCOUNT is None\n",
        "    or SERVICE_ACCOUNT == \"[your-service-account]\"\n",
        "):\n",
-        "    # Get your service account from gcloud\n",
-        "    if not IS_COLAB:\n",
-        "        shell_output = !gcloud auth list 2>/dev/null\n",
-        "        SERVICE_ACCOUNT = shell_output[2].replace(\"*\", \"\").strip()\n",
-        "\n",
-        "    if IS_COLAB:\n",
-        "        shell_output = ! gcloud projects describe  $PROJECT_ID\n",
-        "        project_number = shell_output[-1].split(\":\")[1].strip().replace(\"'\", \"\")\n",
-        "        SERVICE_ACCOUNT = f\"{project_number}-compute@developer.gserviceaccount.com\"\n",
-        "\n",
+        "    # Get your GCP project id from gcloud\n",
+        "    shell_output = !gcloud auth list 2>/dev/null\n",
+        "    SERVICE_ACCOUNT = shell_output[2].strip()\n",
        "    print(\"Service Account:\", SERVICE_ACCOUNT)"
      ]
    },
@@ -590,11 +602,7 @@
      },
      "outputs": [],
      "source": [
-        "import google.cloud.aiplatform as aip\n",
-        "import tensorflow as tf\n",
-        "from google_cloud_pipeline_components.experimental.custom_job import utils\n",
-        "from kfp.v2 import compiler, dsl\n",
-        "from kfp.v2.dsl import component"
+        "import google.cloud.aiplatform as aip"
      ]
    },
    {
@@ -619,6 +627,29 @@
        "PIPELINE_ROOT = \"{}/pipeline_root/bikes_weather\".format(BUCKET_URI)"
      ]
    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "additional_imports"
+      },
+      "source": [
+        "Additional imports."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "e3fca6d3"
+      },
+      "outputs": [],
+      "source": [
+        "import tensorflow as tf\n",
+        "from google_cloud_pipeline_components.experimental.custom_job import utils\n",
+        "from kfp.v2 import compiler, dsl\n",
+        "from kfp.v2.dsl import component"
+      ]
+    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -653,7 +684,7 @@
        "\n",
        "Set the variables `TRAIN_GPU/TRAIN_NGPU` and `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 Telsa K80 GPUs allocated to each VM, you would specify:\n",
        "\n",
-        "    (aip.gapic.AcceleratorType.NVIDIA_TESLA_K80, 4)\n",
+        "    (aip.AcceleratorType.NVIDIA_TESLA_K80, 4)\n",
        "\n",
        "\n",
        "Otherwise specify `(None, None)` to use a container image to run on a CPU.\n",
@@ -718,7 +749,7 @@
        "if os.getenv(\"IS_TESTING_TF\"):\n",
        "    TF = os.getenv(\"IS_TESTING_TF\")\n",
        "else:\n",
-        "    TF = \"2-5\"\n",
+        "    TF = \"2-1\"\n",
        "\n",
        "if TF[0] == \"2\":\n",
        "    if TRAIN_GPU:\n",
@@ -1358,9 +1389,8 @@
        "batch_job = aip.BatchPredictionJob(batch_job_id)\n",
        "batch_job.delete()\n",
        "\n",
-        "delete_bucket = False\n",
-        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
-        "    ! gsutil rm -rf {BUCKET_URI}"
+        "# uncomment to delete your bucket\n",
+        "# ! gsutil rm -rf {BUCKET_URI}"
      ]
    }
  ],
@@ -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/pipelines/pipelines_intro_kfp.ipynb\">\n",
+        "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/pipelines/pipelines_intro_kfp.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/pipelines/pipelines_intro_kfp.ipynb\">\n",
+        "    <a href=\"https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/master/notebooks/official/pipelines/pipelines_intro_kfp.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/notebooks/deploy-notebook?download_url=https://github.com/GoogleCloudPlatform/vertex-ai-samples/blob/main/notebooks/official/pipelines/pipelines_intro_kfp.ipynb\">\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/official/pipelines/pipelines_intro_kfp.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",
@@ -72,15 +72,9 @@
      "source": [
        "### Objective\n",
        "\n",
-        "In this tutorial, you use the KFP SDK to build pipelines that generate evaluation metrics.\n",
-        "\n",
-        "This tutorial uses the following Google Cloud ML services:\n",
-        "\n",
-        "- `Vertex AI Pipelines`\n",
-        "\n",
        "The steps performed include:\n",
        "\n",
-        "- Define and compile a `Vertex AI` pipeline.\n",
+        "- Define and compile a pipeline.\n",
        "- Schedule a recurring pipeline run.\n",
        "- Specify which service account to use for a pipeline run."
      ]
@@ -117,7 +111,7 @@
      "source": [
        "### Set up your local development environment\n",
        "\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",
+        "If you are using Colab or Google Cloud 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",
@@ -150,7 +144,7 @@
      "source": [
        "## Installation\n",
        "\n",
-        "Install the packages required for executing this notebook."
+        "Install the latest version of Vertex AI SDK for Python."
      ]
    },
    {
@@ -163,20 +157,53 @@
      "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",
+        "# Google Cloud Notebook\n",
+        "if os.path.exists(\"/opt/deeplearning/metadata/env_version\"):\n",
        "    USER_FLAG = \"--user\"\n",
+        "else:\n",
+        "    USER_FLAG = \"\"\n",
        "\n",
-        "! pip3 install --upgrade google-cloud-aiplatform {USER_FLAG} -q\n",
-        "! pip3 install -U google-cloud-storage {USER_FLAG} -q\n",
-        "! pip3 install {USER_FLAG} kfp google-cloud-pipeline-components --upgrade -q"
+        "! pip3 install --upgrade google-cloud-aiplatform $USER_FLAG"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "install_storage"
+      },
+      "source": [
+        "Install the latest GA version of *google-cloud-storage* library as well."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "Q9cY6x132Ouw"
+      },
+      "outputs": [],
+      "source": [
+        "! pip3 install -U google-cloud-storage $USER_FLAG"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "install_kfp"
+      },
+      "source": [
+        "Install the latest GA version of *KFP SDK* library as well."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "nbULuPjF2Oux"
+      },
+      "outputs": [],
+      "source": [
+        "! pip3 install $USER kfp --upgrade"
      ]
    },
    {
@@ -370,30 +397,23 @@
      "source": [
        "### Authenticate your Google Cloud account\n",
        "\n",
-        "**If you are using Vertex AI Workbench Notebook**, your environment is already authenticated. Skip this step.\n",
+        "**If you are using Google Cloud Notebook**, your environment is already authenticated. Skip this step.\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",
+        "**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",
-        "1. In the Cloud Console, go to the [**Create service account key**\n",
-        "   page](https://console.cloud.google.com/apis/credentials/serviceaccountkey).\n",
+        "In the Cloud Console, go to the [Create service account key](https://console.cloud.google.com/apis/credentials/serviceaccountkey) page.\n",
        "\n",
-        "2. Click **Create service account**.\n",
+        "**Click Create service account**.\n",
        "\n",
-        "3. In the **Service account name** field, enter a name, and\n",
-        "   click **Create**.\n",
+        "In the **Service account name** field, enter a name, and 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",
+        "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",
        "\n",
-        "5. Click *Create*. A JSON file that contains your key downloads to your\n",
-        "local environment.\n",
+        "Click Create. A JSON file that contains your key downloads to your 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."
+        "Enter the path to your service account key as the GOOGLE_APPLICATION_CREDENTIALS variable in the cell below and run the cell."
      ]
    },
    {
@@ -412,11 +432,8 @@
        "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 on Google Cloud Notebook, then don't execute this code\n",
+        "if not os.path.exists(\"/opt/deeplearning/metadata/env_version\"):\n",
        "    if \"google.colab\" in sys.modules:\n",
        "        from google.colab import auth as google_auth\n",
        "\n",
@@ -464,9 +481,8 @@
      },
      "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_URI = \"gs://\" + BUCKET_NAME"
+        "if BUCKET_URI == \"\" or BUCKET_URI is None or BUCKET_URI == \"gs://[your-bucket-name]\":\n",
+        "    BUCKET_URI = \"gs://\" + PROJECT_ID + \"aip-\" + TIMESTAMP"
      ]
    },
    {
@@ -544,15 +560,12 @@
        "    or SERVICE_ACCOUNT is None\n",
        "    or SERVICE_ACCOUNT == \"[your-service-account]\"\n",
        "):\n",
-        "    # Get your service account from gcloud\n",
-        "    if not IS_COLAB:\n",
-        "        shell_output = !gcloud auth list 2>/dev/null\n",
-        "        SERVICE_ACCOUNT = shell_output[2].replace(\"*\", \"\").strip()\n",
        "\n",
-        "    if IS_COLAB:\n",
-        "        shell_output = ! gcloud projects describe  $PROJECT_ID\n",
-        "        project_number = shell_output[-1].split(\":\")[1].strip().replace(\"'\", \"\")\n",
-        "        SERVICE_ACCOUNT = f\"{project_number}-compute@developer.gserviceaccount.com\"\n",
+        "    # Get your GCP project id from gcloud\n",
+        "\n",
+        "    shell_output = !gcloud auth list 2>/dev/null\n",
+        "\n",
+        "    SERVICE_ACCOUNT = shell_output[2].replace(\"*\", \"\").strip()\n",
        "\n",
        "    print(\"Service Account:\", SERVICE_ACCOUNT)"
      ]
@@ -601,12 +614,7 @@
      },
      "outputs": [],
      "source": [
-        "from typing import NamedTuple\n",
-        "\n",
-        "import google.cloud.aiplatform as aip\n",
-        "from kfp import dsl\n",
-        "from kfp.v2 import compiler\n",
-        "from kfp.v2.dsl import component"
+        "import google.cloud.aiplatform as aip"
      ]
    },
    {
@@ -656,6 +664,30 @@
        "PIPELINE_ROOT = \"{}/pipeline_root/intro\".format(BUCKET_URI)"
      ]
    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "additional_imports"
+      },
+      "source": [
+        "Additional imports."
+      ]
+    },
+    {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+        "id": "import_kfp:namedtuple"
+      },
+      "outputs": [],
+      "source": [
+        "from typing import NamedTuple\n",
+        "\n",
+        "from kfp import dsl\n",
+        "from kfp.v2 import compiler\n",
+        "from kfp.v2.dsl import component"
+      ]
+    },
    {
      "cell_type": "markdown",
      "metadata": {
@@ -1235,7 +1267,7 @@
        "except Exception as e:\n",
        "    print(e)\n",
        "\n",
-        "if delete_bucket or os.getenv(\"IS_TESTING\"):\n",
+        "if delete_bucket and \"BUCKET_URI\" in globals():\n",
        "    ! gsutil rm -r $BUCKET_URI"
      ]
    }
@@ -155,7 +155,7 @@
      "source": [
        "### Install additional packages\n",
        "\n",
-        "Install additional package dependencies not installed in your notebook environment, such as XGBoost, AdaNet, or TensorFlow Hub. Use the latest major GA version of each package."
+        "Install additional package dependencies not installed in your notebook environment, such as {XGBoost, AdaNet, or TensorFlow Hub TODO: Replace with relevant packages for the tutorial}. Use the latest major GA version of each package."
      ]
    },
    {
@@ -247,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 the Vertex AI API](https://console.cloud.google.com/flows/enableapi?apiid=aiplatform.googleapis.com). {TODO: Update the APIs needed for your tutorial. Edit the API names, and update the link to append the API IDs, separating each one with a comma. For example, container.googleapis.com,cloudbuild.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",
Author	SHA1	Message	Date
Andrew Ferlitsch	6132e76d90	update: touchups	2022-06-23 16:56:20 +00:00
Andrew Ferlitsch	4cb8cbf83e	update: touchups	2022-06-23 16:46:46 +00:00