Updated discoveryengine url so it works for all regions

GoogleCloudPlatform · Sep 27, 2024 · 401a00b · 401a00b
1 parent 39850c2
commit 401a00b
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/examples/vertex_ai_conversation/check_documents_in_datastore.ipynb b/examples/vertex_ai_conversation/check_documents_in_datastore.ipynb
@@ -9,17 +9,17 @@
     "\n",
     "<table align=\"left\">\n",
     "  <td style=\"text-align: center\">\n",
-    "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/dfcx-scrapi/blob/main/examples/vertex_ai_conversation/evaluation_tool__numeric_score__colab.ipynb\">\n",
+    "    <a href=\"https://colab.research.google.com/github/GoogleCloudPlatform/dfcx-scrapi/blob/main/examples/vertex_ai_conversation/check_documents_in_datastore.ipynb\">\n",
     "      <img src=\"https://cloud.google.com/ml-engine/images/colab-logo-32px.png\" alt=\"Google Colaboratory logo\"><br> Run in Colab\n",
     "    </a>\n",
     "  </td>\n",
     "  <td style=\"text-align: center\">\n",
-    "    <a href=\"https://github.com/GoogleCloudPlatform/dfcx-scrapi/blob/main/examples/vertex_ai_conversation/evaluation_tool__numeric_score__colab.ipynb\">\n",
+    "    <a href=\"https://github.com/GoogleCloudPlatform/dfcx-scrapi/blob/main/examples/vertex_ai_conversation/check_documents_in_datastore.ipynb\">\n",
     "      <img src=\"https://cloud.google.com/ml-engine/images/github-logo-32px.png\" alt=\"GitHub logo\"><br> View on GitHub\n",
     "    </a>\n",
     "  </td>\n",
     "  <td style=\"text-align: center\">\n",
-    "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/dfcx-scrapi/blob/main/examples/vertex_ai_conversation/evaluation_tool__numeric_score__colab.ipynb\">\n",
+    "    <a href=\"https://console.cloud.google.com/vertex-ai/workbench/deploy-notebook?download_url=https://raw.githubusercontent.com/GoogleCloudPlatform/dfcx-scrapi/blob/main/examples/vertex_ai_conversation/check_documents_in_datastore.ipynb\">\n",
     "      <img src=\"https://lh3.googleusercontent.com/UiNooY4LUgW_oTvpsNhPpQzsstV5W8F7rYgxgGBD85cWJoLmrOzhVs_ksK_vgx40SHs7jCqkTkCk=e14-rj-sc0xffffff-h130-w32\" alt=\"Vertex AI logo\"><br> Open in Vertex AI Workbench\n",
     "    </a>\n",
     "  </td>\n",
@@ -29,23 +29,17 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "vscode": {
-     "languageId": "plaintext"
-    }
-   },
-   "outputs": [],
+   "cell_type": "markdown",
+   "metadata": {},
    "source": [
-    "## Instructions:"
+    "## Instructions"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Setup:"
+    "## Setup"
    ]
   },
   {
@@ -91,11 +85,19 @@
     "from google.api_core import operations_v1, grpc_helpers\n",
     "from google.longrunning import operations_pb2\n",
     "from typing import List, Optional\n",
+    "from google.api_core.client_options import ClientOptions\n",
+    "\n",
     "\n",
     "def list_documents(\n",
     "    project_id: str, location: str, datastore_id: str, rate_limit: int = 1):\n",
     "  \"\"\"Gets a list of docs in a datastore.\"\"\"\n",
-    "  client = discoveryengine_v1.DocumentServiceClient()\n",
+    "  # Create a client\n",
+    "  client_options = (\n",
+    "        ClientOptions(api_endpoint=f\"{location}-discoveryengine.googleapis.com\")\n",
+    "        if location != \"global\"\n",
+    "        else None)\n",
+    "    \n",
+    "  client = discoveryengine_v1.DocumentServiceClient(client_options=client_options)\n",
     "\n",
     "  request = discoveryengine_v1.ListDocumentsRequest(\n",
     "      parent=f'projects/{project_id}/locations/{location}/collections/default_collection/dataStores/{datastore_id}/branches/0',\n",