From 1ac9077afbb3765d6af1d74be912509f0841c5cb Mon Sep 17 00:00:00 2001 From: Xun Zhang Date: Thu, 15 May 2025 10:17:02 -0700 Subject: [PATCH 1/2] fix the tutorial in AIConnectorHelper when fetching domain_url Signed-off-by: Xun Zhang --- docs/tutorials/aws/AIConnectorHelper.ipynb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/tutorials/aws/AIConnectorHelper.ipynb b/docs/tutorials/aws/AIConnectorHelper.ipynb index 3df81cf1ff..030b797b5c 100644 --- a/docs/tutorials/aws/AIConnectorHelper.ipynb +++ b/docs/tutorials/aws/AIConnectorHelper.ipynb @@ -37,9 +37,22 @@ " domain_info = response['DomainStatus']\n", "\n", " # Extract the domain URL and ARN\n", - " domain_url = domain_info['Endpoint']\n", " domain_arn = domain_info['ARN']\n", "\n", + " # Check if domain has VPC endpoints\n", + " if 'Endpoints' in domain_info:\n", + " # VPC domain case\n", + " if 'vpc' in domain_info['Endpoints']:\n", + " domain_url = domain_info['Endpoints']['vpc']\n", + " else:\n", + " domain_url = next(iter(domain_info['Endpoints'].values()))\n", + " # Non-VPC domain case\n", + " elif 'Endpoint' in domain_info:\n", + " domain_url = domain_info['Endpoint']\n", + " else:\n", + " print(f\"No endpoint found for domain '{domain_name}'\")\n", + " return None, None\n", + "\n", " return f'https://{domain_url}', domain_arn\n", "\n", " except opensearch_client.exceptions.ResourceNotFoundException:\n", From ba049e7b4d9afe6b53317a005b1aefdd04bdd00f Mon Sep 17 00:00:00 2001 From: Xun Zhang Date: Wed, 21 May 2025 16:58:34 -0700 Subject: [PATCH 2/2] fix for deepseek notebook Signed-off-by: Xun Zhang --- docs/tutorials/aws/AIConnectorHelper.ipynb | 2 +- .../aws/DeepSeek_demo_notebook_for_RAG.ipynb | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/aws/AIConnectorHelper.ipynb b/docs/tutorials/aws/AIConnectorHelper.ipynb index 030b797b5c..f70ba34256 100644 --- a/docs/tutorials/aws/AIConnectorHelper.ipynb +++ b/docs/tutorials/aws/AIConnectorHelper.ipynb @@ -46,7 +46,7 @@ " domain_url = domain_info['Endpoints']['vpc']\n", " else:\n", " domain_url = next(iter(domain_info['Endpoints'].values()))\n", - " # Non-VPC domain case\n", + " # Non-VPC domain case\n", " elif 'Endpoint' in domain_info:\n", " domain_url = domain_info['Endpoint']\n", " else:\n", diff --git a/docs/tutorials/aws/DeepSeek_demo_notebook_for_RAG.ipynb b/docs/tutorials/aws/DeepSeek_demo_notebook_for_RAG.ipynb index 9746765979..21e4756466 100644 --- a/docs/tutorials/aws/DeepSeek_demo_notebook_for_RAG.ipynb +++ b/docs/tutorials/aws/DeepSeek_demo_notebook_for_RAG.ipynb @@ -65,8 +65,22 @@ " try:\n", " response = self.opensearch_client.describe_elasticsearch_domain(DomainName=domain_name)\n", " domain_info = response['DomainStatus']\n", - " domain_url = domain_info['Endpoint']\n", " domain_arn = domain_info['ARN']\n", + "\n", + " # Check if domain has VPC endpoints\n", + " if 'Endpoints' in domain_info:\n", + " # VPC domain case\n", + " if 'vpc' in domain_info['Endpoints']:\n", + " domain_url = domain_info['Endpoints']['vpc']\n", + " else:\n", + " domain_url = next(iter(domain_info['Endpoints'].values()))\n", + " # Non-VPC domain case\n", + " elif 'Endpoint' in domain_info:\n", + " domain_url = domain_info['Endpoint']\n", + " else:\n", + " print(f\"No endpoint found for domain '{domain_name}'\")\n", + " return None, None\n", + "\n", " return f'https://{domain_url}', domain_arn\n", " except self.opensearch_client.exceptions.ResourceNotFoundException:\n", " print(f\"Domain '{domain_name}' not found.\")\n",