updated code

Author: zbyosufzai

notebooks/GenAI/notebooks/sharepoint_RAG_bot.ipynb

@@ -378,7 +378,7 @@
    "outputs": [],
    "source": [
     "#DATASTORE\n",
-    "url = f\"https://{service_name}.search.windows.net/datasources?api-version=2023-10-01-Preview\"\n",
+    "url = f\"https://{service_name}.search.windows.net/datasources?api-version=2024-05-01-preview\"\n", 
     "payload = {\"name\" : f\"{datastore_name}\", \"type\" : \"sharepoint\", \n",
     "           \"credentials\" : { \"connectionString\" : f\"SharePointOnlineEndpoint={sharepoint_endpoint};ApplicationId={app_id};TenantId={tenant_id}\" }, \n",
     "           \"container\" : { \"name\" : \"useQuery\", \"query\" : f\"includeLibrary={library}\"}}\n",
@@ -404,7 +404,7 @@
    "outputs": [],
    "source": [
     "#INDEX\n",
-    "url = f\"https://{service_name}.search.windows.net/indexes?api-version=2023-10-01-Preview\"\n",
+    "url = f\"https://{service_name}.search.windows.net/indexes?api-version=2024-05-01-preview\"\n",
     "payload = {\"name\" : f\"{index_name}\", \"fields\": [\n",
     "    { \"name\": \"id\", \"type\": \"Edm.String\", \"key\": True, \"searchable\": False },\n",
     "    { \"name\": \"metadata_spo_item_name\", \"type\": \"Edm.String\", \"key\": False, \"searchable\": True, \"filterable\": False, \"sortable\": False, \"facetable\": False },\n",
@@ -436,7 +436,7 @@
    "source": [
     "#INDEXER\n",
     "\n",
-    "url = f\"https://{service_name}.search.windows.net/indexers?api-version=2023-10-01-Preview\"\n",
+    "url = f\"https://{service_name}.search.windows.net/indexers?api-version=2024-05-01-preview\"\n",
     "payload = { \"name\" : f\"{indexer_name}\", \n",
     "    \"dataSourceName\" : f\"{datastore_name}\", \n",
     "    \"targetIndexName\" : f\"{index_name}\", \n",
@@ -485,7 +485,7 @@
    "source": [
     "import requests\n",
     "#RETRIEVE PASSCODE\n",
-    "url = f\"https://{service_name}.search.windows.net/indexers/{indexer_name}/status?api-version=2023-10-01-Preview\"\n",
+    "url = f\"https://{service_name}.search.windows.net/indexers/{indexer_name}/status?api-version=2024-05-01-preview\"\n",
     "headers = {\"Content-Type\": \"application/json\", \"api-key\": f\"{index_service_key}\"}\n",
     "r = requests.get(url, headers=headers)\n",
     "r.json()"
@@ -578,7 +578,7 @@
     "client = AzureOpenAI(\n",
     "    base_url=f\"{endpoint}/openai/deployments/{deployment_id}/extensions\",\n",
     "    api_key=api_key,\n",
-    "    api_version=\"2023-08-01-preview\",\n",
+    "    api_version=\"2024-05-01-preview\",\n",
     ")\n",
     "\n",
     "completion = client.chat.completions.create(\n",
@@ -594,22 +594,29 @@
     "    ],\n",
     "    stream=True,\n",
     "    extra_body={\n",
-    "        \"dataSources\": [\n",
-    "            {\n",
-    "                \"type\": \"AzureCognitiveSearch\",\n",
-    "                \"parameters\": {\n",
-    "                    \"endpoint\": search_endpoint,\n",
-    "                    \"key\": index_service_key,\n",
-    "                    \"indexName\": index_name\n",
-    "                }\n",
-    "            }\n",
-    "        ]\n",
-    "    }\n",
-    ")\n",
+    "    \"data_sources\": [{\n",
+    "      \"type\": \"azure_search\",\n"
+    "      \"parameters\": {\n",
+    "         \"filter\": None,\n",
+    "         \"endpoint\": search_endpoint,\n", 
+    "         \"index_name\": index_name\n",
+    "         \"semantic_configuration\": \"default\",\n"
+    "         \"authentication\": {\n",
+    "         \"type\": \"api_key\",\n",
+    "             \"key\": index_service_key\n",
+    "             },\n",
+    "         \"query_type\": \"simple\",\n"
+    "         \"in_scope\": True,\n"
+    "         \"role_information\": \"You are an AI assistant that helps people find information.\",\n"
+    "         \"strictness\": 4,\n"
+    "         \"top_n_documents\": 5\n"
+    "      }\n",
+    "      }]\n,
+    "      }])\n,
     "\n",
     "for chunk in completion:\n",
-    "    if chunk.choices[0].delta.content is not None:\n",
-    "        print(chunk.choices[0].delta.content, end=\"\")"
+    "    if chunk.choices[0].message.content is not None:\n",
+    "        print(chunk.choices[0].message.content, end=\"\")"
    ]
   },
   {