fix: Fixed GitHub issue #1846 (#1851)

Author: Prasanjeet-Microsoft

.env.sample

@@ -14,6 +14,9 @@ AZURE_SEARCH_FIELDS_TAG=tag
 AZURE_SEARCH_FIELDS_METADATA=metadata
 AZURE_SEARCH_FILENAME_COLUMN=filepath
 AZURE_SEARCH_TITLE_COLUMN=title
+AZURE_SEARCH_SOURCE_COLUMN=source
+AZURE_SEARCH_TEXT_COLUMN=text
+AZURE_SEARCH_LAYOUT_TEXT_COLUMN=layoutText
 AZURE_SEARCH_URL_COLUMN=url
 AZURE_SEARCH_CONVERSATIONS_LOG_INDEX=conversations-log
 AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION=false

code/create_app.py

@@ -209,11 +209,6 @@ def conversation_with_data(conversation: Request, env_helper: EnvHelper):
                                 env_helper.AZURE_SEARCH_CONTENT_VECTOR_COLUMN
                             ],
                             "title_field": env_helper.AZURE_SEARCH_TITLE_COLUMN or None,
-                            "source_field": env_helper.AZURE_SEARCH_SOURCE_COLUMN
-                            or None,
-                            "text_field": env_helper.AZURE_SEARCH_TEXT_COLUMN or None,
-                            "layoutText_field": env_helper.AZURE_SEARCH_LAYOUT_TEXT_COLUMN
-                            or None,
                             "url_field": env_helper.AZURE_SEARCH_FIELDS_METADATA
                             or None,
                             "filepath_field": (

code/tests/functional/tests/backend_api/with_byod/test_conversation_flow.py

@@ -147,9 +147,6 @@ def test_post_makes_correct_call_to_azure_openai(
                                     "AZURE_SEARCH_FIELDS_METADATA"
                                 ),
                                 "filepath_field": "filepath",
-                                "source_field": "source",
-                                "text_field": "text",
-                                "layoutText_field": "layoutText",
                             },
                             "filter": app_config.get("AZURE_SEARCH_FILTER"),
                             "in_scope": True,

code/tests/test_app.py

@@ -690,9 +690,6 @@ def test_conversation_azure_byod_returns_correct_response_when_streaming_with_da
                                 "title_field": AZURE_SEARCH_TITLE_COLUMN,
                                 "url_field": env_helper_mock.AZURE_SEARCH_FIELDS_METADATA,
                                 "filepath_field": AZURE_SEARCH_FILENAME_COLUMN,
-                                "source_field": AZURE_SEARCH_SOURCE_COLUMN,
-                                "text_field": AZURE_SEARCH_TEXT_COLUMN,
-                                "layoutText_field": AZURE_SEARCH_LAYOUT_TEXT_COLUMN,
                             },
                             "filter": AZURE_SEARCH_FILTER,
                             "in_scope": AZURE_SEARCH_ENABLE_IN_DOMAIN,

infra/core/host/functions.bicep

@@ -113,4 +113,4 @@ output name string = functions.outputs.name
 output uri string = functions.outputs.uri
 output azureWebJobsStorage string = useKeyVault
   ? 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${storage.listKeys().keys[0].value};EndpointSuffix=${environment().suffixes.storage}'
-  : storage.name
+  : ''

infra/main.bicep

@@ -328,9 +328,6 @@ param recognizedLanguages string = 'en-US,fr-FR,de-DE,it-IT'
 @description('Azure Machine Learning Name')
 param azureMachineLearningName string = 'mlw-${resourceToken}'
 
-@description('Resource ID of existing Log Analytics workspace. If not provided, a new one will be created.')
-param existingLogAnalyticsResourceId string = ''
-
 var blobContainerName = 'documents'
 var queueName = 'doc-processing'
 var clientKey = '${uniqueString(guid(subscription().id, deployment().name))}${newGuidString}'
@@ -1524,7 +1521,9 @@ output ORCHESTRATION_STRATEGY string = orchestrationStrategy
 output USE_KEY_VAULT bool = useKeyVault
 output AZURE_AUTH_TYPE string = authType
 output BACKEND_URL string = backendUrl
-output AzureWebJobsStorage string = function.outputs.AzureWebJobsStorage
+output AzureWebJobsStorage string = hostingModel == 'code'
+  ? function.outputs.AzureWebJobsStorage
+  : function_docker.outputs.AzureWebJobsStorage
 output FUNCTION_KEY string = clientKey
 output FRONTEND_WEBSITE_NAME string = hostingModel == 'code'
   ? web.outputs.FRONTEND_API_URI

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.36.1.42791",
-      "templateHash": "9016078693098336838"
+      "templateHash": "9719682488284708611"
     }
   },
   "parameters": {
@@ -663,13 +663,6 @@
       "metadata": {
         "description": "Azure Machine Learning Name"
       }
-    },
-    "existingLogAnalyticsResourceId": {
-      "type": "string",
-      "defaultValue": "",
-      "metadata": {
-        "description": "Resource ID of existing Log Analytics workspace. If not provided, a new one will be created."
-      }
     }
   },
   "variables": {
@@ -8491,7 +8484,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.36.1.42791",
-              "templateHash": "4946337189154540704"
+              "templateHash": "3041942542881708674"
             }
           },
           "parameters": {
@@ -8690,7 +8683,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.36.1.42791",
-                      "templateHash": "1623075402073661527"
+                      "templateHash": "9131982169830455839"
                     },
                     "description": "Creates an Azure Function in an existing Azure App Service plan."
                   },
@@ -9268,7 +9261,7 @@
                     },
                     "azureWebJobsStorage": {
                       "type": "string",
-                      "value": "[if(parameters('useKeyVault'), format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', parameters('storageAccountName'), listKeys('storage', '2021-09-01').keys[0].value, environment().suffixes.storage), parameters('storageAccountName'))]"
+                      "value": "[if(parameters('useKeyVault'), format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', parameters('storageAccountName'), listKeys('storage', '2021-09-01').keys[0].value, environment().suffixes.storage), '')]"
                     }
                   }
                 }
@@ -9803,7 +9796,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.36.1.42791",
-              "templateHash": "4946337189154540704"
+              "templateHash": "3041942542881708674"
             }
           },
           "parameters": {
@@ -10002,7 +9995,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.36.1.42791",
-                      "templateHash": "1623075402073661527"
+                      "templateHash": "9131982169830455839"
                     },
                     "description": "Creates an Azure Function in an existing Azure App Service plan."
                   },
@@ -10580,7 +10573,7 @@
                     },
                     "azureWebJobsStorage": {
                       "type": "string",
-                      "value": "[if(parameters('useKeyVault'), format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', parameters('storageAccountName'), listKeys('storage', '2021-09-01').keys[0].value, environment().suffixes.storage), parameters('storageAccountName'))]"
+                      "value": "[if(parameters('useKeyVault'), format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', parameters('storageAccountName'), listKeys('storage', '2021-09-01').keys[0].value, environment().suffixes.storage), '')]"
                     }
                   }
                 }
@@ -12337,7 +12330,7 @@
     },
     "AzureWebJobsStorage": {
       "type": "string",
-      "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('rgName')), 'Microsoft.Resources/deployments', parameters('functionName')), '2022-09-01').outputs.AzureWebJobsStorage.value]"
+      "value": "[if(equals(parameters('hostingModel'), 'code'), reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('rgName')), 'Microsoft.Resources/deployments', parameters('functionName')), '2022-09-01').outputs.AzureWebJobsStorage.value, reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('rgName')), 'Microsoft.Resources/deployments', format('{0}-docker', parameters('functionName'))), '2022-09-01').outputs.AzureWebJobsStorage.value)]"
     },
     "FUNCTION_KEY": {
       "type": "string",