fix blob connection string

MSUSAzureAccelerators · May 9, 2024 · 097dfee · 097dfee
1 parent ccacc38
commit 097dfee
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 76 deletions.
diff --git a/01-Load-Data-ACogSearch.ipynb b/01-Load-Data-ACogSearch.ipynb
@@ -77,10 +77,10 @@
    "outputs": [],
    "source": [
     "# Define the names for the data source, skillset, index and indexer\n",
-    "datasource_name = \"cogsrch-datasource-files\"\n",
-    "index_name = \"cogsrch-index-files\"\n",
-    "skillset_name = \"cogsrch-skillset-files\"\n",
-    "indexer_name = \"cogsrch-indexer-files\""
+    "datasource_name = \"cogsrch-datasource-files-2\"\n",
+    "index_name = \"cogsrch-index-files-2\"\n",
+    "skillset_name = \"cogsrch-skillset-files-2\"\n",
+    "indexer_name = \"cogsrch-indexer-files-2\""
    ]
   },
   {
@@ -110,7 +110,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "204\n",
+      "201\n",
       "True\n"
      ]
     }
@@ -195,7 +195,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "204\n",
+      "201\n",
       "True\n"
      ]
     }
@@ -339,7 +339,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "204\n",
+      "201\n",
       "True\n"
      ]
     }
@@ -514,7 +514,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "204\n",
+      "201\n",
       "True\n"
      ]
     }
@@ -564,7 +564,18 @@
    "cell_type": "code",
    "execution_count": 11,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'{\"@odata.context\":\"https://cog-search-zf4fwhz3gdn64.search.windows.net/$metadata#indexers/$entity\",\"@odata.etag\":\"\\\\\"0x8DC7052637CA2AC\\\\\"\",\"name\":\"cogsrch-indexer-files-2\",\"description\":null,\"dataSourceName\":\"cogsrch-datasource-files-2\",\"skillsetName\":\"cogsrch-skillset-files-2\",\"targetIndexName\":\"cogsrch-index-files-2\",\"disabled\":null,\"schedule\":{\"interval\":\"PT30M\",\"startTime\":\"2024-05-09T18:03:38.4035486Z\"},\"parameters\":{\"batchSize\":null,\"maxFailedItems\":-1,\"maxFailedItemsPerBatch\":-1,\"base64EncodeKeys\":null,\"configuration\":{\"dataToExtract\":\"contentAndMetadata\",\"imageAction\":\"generateNormalizedImages\"}},\"fieldMappings\":[{\"sourceFieldName\":\"metadata_title\",\"targetFieldName\":\"title\",\"mappingFunction\":null},{\"sourceFieldName\":\"metadata_storage_name\",\"targetFieldName\":\"name\",\"mappingFunction\":null},{\"sourceFieldName\":\"metadata_storage_path\",\"targetFieldName\":\"location\",\"mappingFunction\":null}],\"outputFieldMappings\":[],\"cache\":null,\"encryptionKey\":null}'"
+      ]
+     },
+     "execution_count": 11,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "# Uncomment if you find an error\n",
     "# r.text"
@@ -579,7 +590,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 14,
    "metadata": {
     "tags": []
    },
@@ -589,8 +600,8 @@
      "output_type": "stream",
      "text": [
       "200\n",
-      "Status: success\n",
-      "Items Processed: 0\n",
+      "Status: inProgress\n",
+      "Items Processed: 40\n",
       "True\n"
      ]
     }

diff --git a/02-LoadCSVOneToMany-ACogSearch.ipynb b/02-LoadCSVOneToMany-ACogSearch.ipynb
@@ -17,7 +17,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "id": "c088c844-1e71-4279-a8fe-a77a007c15c4",
    "metadata": {},
    "outputs": [],
@@ -34,21 +34,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "id": "c4908539-1d17-46a3-b9e0-dcc46a210c4f",
    "metadata": {},
    "outputs": [],
    "source": [
     "# Define the names for the data source, index and indexer\n",
-    "datasource_name = \"cogsrch-datasource-csv\"\n",
-    "skillset_name = \"cogsrch-skillset-csv\"\n",
-    "index_name = \"cogsrch-index-csv\"\n",
-    "indexer_name = \"cogsrch-indexer-csv\""
+    "datasource_name = \"cogsrch-datasource-csv-2\"\n",
+    "skillset_name = \"cogsrch-skillset-csv-2\"\n",
+    "index_name = \"cogsrch-index-csv-2\"\n",
+    "indexer_name = \"cogsrch-indexer-csv-2\""
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "id": "f2434379-070e-4110-8f5a-7d5bda9a0b7c",
    "metadata": {},
    "outputs": [],
@@ -68,15 +68,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "id": "a9fa6c09-a489-4b6d-8c93-5fc26bae63a0",
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "204\n",
+      "201\n",
       "True\n"
      ]
     }
@@ -120,7 +120,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "id": "2fbbbd0d-3015-4601-9ef1-7008ad168167",
    "metadata": {},
    "outputs": [],
@@ -132,7 +132,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 7,
    "id": "aaac918a-8859-45f5-9519-2cf56bfded88",
    "metadata": {},
    "outputs": [
@@ -148,72 +148,72 @@
       "text/html": [
        "<style type=\"text/css\">\n",
        "</style>\n",
-       "<table id=\"T_deaed\">\n",
+       "<table id=\"T_cd009\">\n",
        "  <thead>\n",
        "    <tr>\n",
        "      <th class=\"blank level0\" >&nbsp;</th>\n",
-       "      <th id=\"T_deaed_level0_col0\" class=\"col_heading level0 col0\" >cord_uid</th>\n",
-       "      <th id=\"T_deaed_level0_col1\" class=\"col_heading level0 col1\" >source_x</th>\n",
-       "      <th id=\"T_deaed_level0_col2\" class=\"col_heading level0 col2\" >title</th>\n",
-       "      <th id=\"T_deaed_level0_col3\" class=\"col_heading level0 col3\" >abstract</th>\n",
-       "      <th id=\"T_deaed_level0_col4\" class=\"col_heading level0 col4\" >authors</th>\n",
-       "      <th id=\"T_deaed_level0_col5\" class=\"col_heading level0 col5\" >url</th>\n",
+       "      <th id=\"T_cd009_level0_col0\" class=\"col_heading level0 col0\" >cord_uid</th>\n",
+       "      <th id=\"T_cd009_level0_col1\" class=\"col_heading level0 col1\" >source_x</th>\n",
+       "      <th id=\"T_cd009_level0_col2\" class=\"col_heading level0 col2\" >title</th>\n",
+       "      <th id=\"T_cd009_level0_col3\" class=\"col_heading level0 col3\" >abstract</th>\n",
+       "      <th id=\"T_cd009_level0_col4\" class=\"col_heading level0 col4\" >authors</th>\n",
+       "      <th id=\"T_cd009_level0_col5\" class=\"col_heading level0 col5\" >url</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th id=\"T_deaed_level0_row0\" class=\"row_heading level0 row0\" >0</th>\n",
-       "      <td id=\"T_deaed_row0_col0\" class=\"data row0 col0\" >ug7v899j</td>\n",
-       "      <td id=\"T_deaed_row0_col1\" class=\"data row0 col1\" >PMC</td>\n",
-       "      <td id=\"T_deaed_row0_col2\" class=\"data row0 col2\" >Clinical features of culture-p...</td>\n",
-       "      <td id=\"T_deaed_row0_col3\" class=\"data row0 col3\" >OBJECTIVE: This retrospective ...</td>\n",
-       "      <td id=\"T_deaed_row0_col4\" class=\"data row0 col4\" >Madani, Tariq A; Al-Ghamdi, Ai...</td>\n",
-       "      <td id=\"T_deaed_row0_col5\" class=\"data row0 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC35282/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC35282/</a></td>\n",
+       "      <th id=\"T_cd009_level0_row0\" class=\"row_heading level0 row0\" >0</th>\n",
+       "      <td id=\"T_cd009_row0_col0\" class=\"data row0 col0\" >ug7v899j</td>\n",
+       "      <td id=\"T_cd009_row0_col1\" class=\"data row0 col1\" >PMC</td>\n",
+       "      <td id=\"T_cd009_row0_col2\" class=\"data row0 col2\" >Clinical features of culture-p...</td>\n",
+       "      <td id=\"T_cd009_row0_col3\" class=\"data row0 col3\" >OBJECTIVE: This retrospective ...</td>\n",
+       "      <td id=\"T_cd009_row0_col4\" class=\"data row0 col4\" >Madani, Tariq A; Al-Ghamdi, Ai...</td>\n",
+       "      <td id=\"T_cd009_row0_col5\" class=\"data row0 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC35282/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC35282/</a></td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th id=\"T_deaed_level0_row1\" class=\"row_heading level0 row1\" >1</th>\n",
-       "      <td id=\"T_deaed_row1_col0\" class=\"data row1 col0\" >02tnwd4m</td>\n",
-       "      <td id=\"T_deaed_row1_col1\" class=\"data row1 col1\" >PMC</td>\n",
-       "      <td id=\"T_deaed_row1_col2\" class=\"data row1 col2\" >Nitric oxide: a pro-inflammato...</td>\n",
-       "      <td id=\"T_deaed_row1_col3\" class=\"data row1 col3\" >Inflammatory diseases of the r...</td>\n",
-       "      <td id=\"T_deaed_row1_col4\" class=\"data row1 col4\" >Vliet, Albert van der; Eiseric...</td>\n",
-       "      <td id=\"T_deaed_row1_col5\" class=\"data row1 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59543/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59543/</a></td>\n",
+       "      <th id=\"T_cd009_level0_row1\" class=\"row_heading level0 row1\" >1</th>\n",
+       "      <td id=\"T_cd009_row1_col0\" class=\"data row1 col0\" >02tnwd4m</td>\n",
+       "      <td id=\"T_cd009_row1_col1\" class=\"data row1 col1\" >PMC</td>\n",
+       "      <td id=\"T_cd009_row1_col2\" class=\"data row1 col2\" >Nitric oxide: a pro-inflammato...</td>\n",
+       "      <td id=\"T_cd009_row1_col3\" class=\"data row1 col3\" >Inflammatory diseases of the r...</td>\n",
+       "      <td id=\"T_cd009_row1_col4\" class=\"data row1 col4\" >Vliet, Albert van der; Eiseric...</td>\n",
+       "      <td id=\"T_cd009_row1_col5\" class=\"data row1 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59543/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59543/</a></td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th id=\"T_deaed_level0_row2\" class=\"row_heading level0 row2\" >2</th>\n",
-       "      <td id=\"T_deaed_row2_col0\" class=\"data row2 col0\" >ejv2xln0</td>\n",
-       "      <td id=\"T_deaed_row2_col1\" class=\"data row2 col1\" >PMC</td>\n",
-       "      <td id=\"T_deaed_row2_col2\" class=\"data row2 col2\" >Surfactant protein-D and pulmo...</td>\n",
-       "      <td id=\"T_deaed_row2_col3\" class=\"data row2 col3\" >Surfactant protein-D (SP-D) pa...</td>\n",
-       "      <td id=\"T_deaed_row2_col4\" class=\"data row2 col4\" >Crouch, Erika C...</td>\n",
-       "      <td id=\"T_deaed_row2_col5\" class=\"data row2 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59549/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59549/</a></td>\n",
+       "      <th id=\"T_cd009_level0_row2\" class=\"row_heading level0 row2\" >2</th>\n",
+       "      <td id=\"T_cd009_row2_col0\" class=\"data row2 col0\" >ejv2xln0</td>\n",
+       "      <td id=\"T_cd009_row2_col1\" class=\"data row2 col1\" >PMC</td>\n",
+       "      <td id=\"T_cd009_row2_col2\" class=\"data row2 col2\" >Surfactant protein-D and pulmo...</td>\n",
+       "      <td id=\"T_cd009_row2_col3\" class=\"data row2 col3\" >Surfactant protein-D (SP-D) pa...</td>\n",
+       "      <td id=\"T_cd009_row2_col4\" class=\"data row2 col4\" >Crouch, Erika C...</td>\n",
+       "      <td id=\"T_cd009_row2_col5\" class=\"data row2 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59549/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59549/</a></td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th id=\"T_deaed_level0_row3\" class=\"row_heading level0 row3\" >3</th>\n",
-       "      <td id=\"T_deaed_row3_col0\" class=\"data row3 col0\" >2b73a28n</td>\n",
-       "      <td id=\"T_deaed_row3_col1\" class=\"data row3 col1\" >PMC</td>\n",
-       "      <td id=\"T_deaed_row3_col2\" class=\"data row3 col2\" >Role of endothelin-1 in lung d...</td>\n",
-       "      <td id=\"T_deaed_row3_col3\" class=\"data row3 col3\" >Endothelin-1 (ET-1) is a 21 am...</td>\n",
-       "      <td id=\"T_deaed_row3_col4\" class=\"data row3 col4\" >Fagan, Karen A; McMurtry, Ivan...</td>\n",
-       "      <td id=\"T_deaed_row3_col5\" class=\"data row3 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59574/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59574/</a></td>\n",
+       "      <th id=\"T_cd009_level0_row3\" class=\"row_heading level0 row3\" >3</th>\n",
+       "      <td id=\"T_cd009_row3_col0\" class=\"data row3 col0\" >2b73a28n</td>\n",
+       "      <td id=\"T_cd009_row3_col1\" class=\"data row3 col1\" >PMC</td>\n",
+       "      <td id=\"T_cd009_row3_col2\" class=\"data row3 col2\" >Role of endothelin-1 in lung d...</td>\n",
+       "      <td id=\"T_cd009_row3_col3\" class=\"data row3 col3\" >Endothelin-1 (ET-1) is a 21 am...</td>\n",
+       "      <td id=\"T_cd009_row3_col4\" class=\"data row3 col4\" >Fagan, Karen A; McMurtry, Ivan...</td>\n",
+       "      <td id=\"T_cd009_row3_col5\" class=\"data row3 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59574/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59574/</a></td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th id=\"T_deaed_level0_row4\" class=\"row_heading level0 row4\" >4</th>\n",
-       "      <td id=\"T_deaed_row4_col0\" class=\"data row4 col0\" >9785vg6d</td>\n",
-       "      <td id=\"T_deaed_row4_col1\" class=\"data row4 col1\" >PMC</td>\n",
-       "      <td id=\"T_deaed_row4_col2\" class=\"data row4 col2\" >Gene expression in epithelial ...</td>\n",
-       "      <td id=\"T_deaed_row4_col3\" class=\"data row4 col3\" >Respiratory syncytial virus (R...</td>\n",
-       "      <td id=\"T_deaed_row4_col4\" class=\"data row4 col4\" >Domachowske, Joseph B; Bonvill...</td>\n",
-       "      <td id=\"T_deaed_row4_col5\" class=\"data row4 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59580/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59580/</a></td>\n",
+       "      <th id=\"T_cd009_level0_row4\" class=\"row_heading level0 row4\" >4</th>\n",
+       "      <td id=\"T_cd009_row4_col0\" class=\"data row4 col0\" >9785vg6d</td>\n",
+       "      <td id=\"T_cd009_row4_col1\" class=\"data row4 col1\" >PMC</td>\n",
+       "      <td id=\"T_cd009_row4_col2\" class=\"data row4 col2\" >Gene expression in epithelial ...</td>\n",
+       "      <td id=\"T_cd009_row4_col3\" class=\"data row4 col3\" >Respiratory syncytial virus (R...</td>\n",
+       "      <td id=\"T_cd009_row4_col4\" class=\"data row4 col4\" >Domachowske, Joseph B; Bonvill...</td>\n",
+       "      <td id=\"T_cd009_row4_col5\" class=\"data row4 col5\" ><a href=\"https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59580/\">https://www.ncbi.nlm.nih.gov/pmc/articles/PMC59580/</a></td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n"
       ],
       "text/plain": [
-       "<pandas.io.formats.style.Styler at 0x7f44dba3b3d0>"
+       "<pandas.io.formats.style.Styler at 0x7f132bad6710>"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -472,7 +472,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 10,
    "id": "b87b8ebd-8091-43b6-9124-cc17021cfb78",
    "metadata": {},
    "outputs": [

diff --git a/04-Complex-Docs.ipynb b/04-Complex-Docs.ipynb
@@ -24,7 +24,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "id": "15f6044e-463f-4988-bc46-a3c3d641c15c",
    "metadata": {},
    "outputs": [],
@@ -75,7 +75,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 3,
    "id": "331692ba-b68e-4b99-9bae-5057da9a389d",
    "metadata": {},
    "outputs": [],
@@ -86,7 +86,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 4,
    "id": "594ff0d4-56e3-4bed-843d-28c7a092069b",
    "metadata": {},
    "outputs": [],
@@ -114,7 +114,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 5,
    "id": "0999e24b-6a75-4fa1-9a5f-426cf0f0bdba",
    "metadata": {},
    "outputs": [],
@@ -136,15 +136,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 6,
    "id": "3554f0b7-fee8-4446-a155-5d22dc0f0888",
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "100%|██████████| 5/5 [00:27<00:00,  5.44s/it]\n"
+      "100%|██████████| 5/5 [00:26<00:00,  5.40s/it]\n"
      ]
     }
    ],

diff --git a/credentials.env b/credentials.env
@@ -5,8 +5,8 @@ BING_SEARCH_URL="https://api.bing.microsoft.com/v7.0/search"
 BOT_DIRECT_CHANNEL_ENDPOINT="https://directline.botframework.com/v3/directline"
 
 # Demo Data (edit with your own if you want to use your own data)
-BLOB_CONNECTION_STRING="BlobEndpoint=https://datasetsgptsmartsearch.blob.core.windows.net/;SharedAccessSignature=sv=2022-11-02&ss=b&srt=sco&sp=rl&se=2026-01-03T02:11:44Z&st=2024-01-02T18:11:44Z&spr=https&sig=ngrEqvqBVaxyuSYqgPVeF%2B9c0fXLs94v3ASgwg7LDBs%3D"
-BLOB_SAS_TOKEN="?sv=2022-11-02&ss=b&srt=sco&sp=rl&se=2025-05-07T22:20:04Z&st=2024-05-07T14:20:04Z&spr=https&sig=iy2PycZwWefYLWwqHjIzwkA6TjEBJTKr65Cd9yuv4HA%3D"
+BLOB_CONNECTION_STRING="BlobEndpoint=https://datasetsgptsmartsearch.blob.core.windows.net/;QueueEndpoint=https://datasetsgptsmartsearch.queue.core.windows.net/;FileEndpoint=https://datasetsgptsmartsearch.file.core.windows.net/;TableEndpoint=https://datasetsgptsmartsearch.table.core.windows.net/;SharedAccessSignature=sv=2022-11-02&ss=bf&srt=sco&sp=rltf&se=2025-05-10T02:01:38Z&st=2024-05-09T18:01:38Z&spr=https&sig=vqU3TzulBIjvhHhUmYxE9zKXnhREuCGDHPpmdPDvv%2FQ%3D"
+BLOB_SAS_TOKEN="?sv=2022-11-02&ss=bf&srt=sco&sp=rltf&se=2025-05-10T02:01:38Z&st=2024-05-09T18:01:38Z&spr=https&sig=vqU3TzulBIjvhHhUmYxE9zKXnhREuCGDHPpmdPDvv%2FQ%3D"
 
 # Edit with your own azure services values