fix: merging dev fixes into main branch (#1622)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Azure-Samples · Jan 14, 2025 · 9edc403 · 9edc403
1 parent a13551b
commit 9edc403
Show file tree

Hide file tree

Showing 12 changed files with 328 additions and 284 deletions.
diff --git a/code/backend/batch/utilities/orchestrator/orchestrator_base.py b/code/backend/batch/utilities/orchestrator/orchestrator_base.py
@@ -17,7 +17,8 @@ def __init__(self) -> None:
         self.message_id = str(uuid4())
         self.tokens = {"prompt": 0, "completion": 0, "total": 0}
         logger.debug(f"New message id: {self.message_id} with tokens {self.tokens}")
-        self.conversation_logger: ConversationLogger = ConversationLogger()
+        if str(self.config.logging.log_user_interactions).lower() == "true":
+            self.conversation_logger: ConversationLogger = ConversationLogger()
         self.content_safety_checker = ContentSafetyChecker()
         self.output_parser = OutputParserTool()
 

diff --git a/code/backend/batch/utilities/parser/output_parser_tool.py b/code/backend/batch/utilities/parser/output_parser_tool.py
@@ -22,10 +22,13 @@ def _get_source_docs_from_answer(self, answer):
 
     def _make_doc_references_sequential(self, answer):
         doc_matches = list(re.finditer(r"\[doc\d+\]", answer))
+        updated_answer = answer
+        offset = 0
         for i, match in enumerate(doc_matches):
-            start, end = match.span()
-            answer = answer[:start] + f"[doc{i + 1}]" + answer[end:]
-        return answer
+            start, end = match.start() + offset, match.end() + offset
+            updated_answer = updated_answer[:start] + f"[doc{i + 1}]" + updated_answer[end:]
+            offset += len(f"[doc{i + 1}]") - (end - start)
+        return updated_answer
 
     def parse(
         self,

diff --git a/infra/app/adminweb.bicep b/infra/app/adminweb.bicep
@@ -62,15 +62,17 @@ module adminweb '../core/host/appservice.bicep' = {
           ).key1
       AZURE_SEARCH_KEY: useKeyVault
         ? searchKeyName
-        : listAdminKeys(
-            resourceId(
-              subscription().subscriptionId,
-              resourceGroup().name,
-              'Microsoft.Search/searchServices',
-              azureAISearchName
-            ),
-            '2021-04-01-preview'
-          ).primaryKey
+        : (azureAISearchName != ''
+            ? listAdminKeys(
+                resourceId(
+                  subscription().subscriptionId,
+                  resourceGroup().name,
+                  'Microsoft.Search/searchServices',
+                  azureAISearchName
+                ),
+                '2021-04-01-preview'
+              ).primaryKey
+            : '')
       AZURE_BLOB_ACCOUNT_KEY: useKeyVault
         ? storageAccountKeyName
         : listKeys(

diff --git a/infra/app/function.bicep b/infra/app/function.bicep
@@ -61,15 +61,17 @@ module function '../core/host/functions.bicep' = {
           ).key1
       AZURE_SEARCH_KEY: useKeyVault
         ? searchKeyName
-        : listAdminKeys(
-            resourceId(
-              subscription().subscriptionId,
-              resourceGroup().name,
-              'Microsoft.Search/searchServices',
-              azureAISearchName
-            ),
-            '2021-04-01-preview'
-          ).primaryKey
+        : (azureAISearchName != ''
+            ? listAdminKeys(
+                resourceId(
+                  subscription().subscriptionId,
+                  resourceGroup().name,
+                  'Microsoft.Search/searchServices',
+                  azureAISearchName
+                ),
+                '2021-04-01-preview'
+              ).primaryKey
+            : '')
       AZURE_BLOB_ACCOUNT_KEY: useKeyVault
         ? storageAccountKeyName
         : listKeys(

diff --git a/infra/app/machinelearning.bicep b/infra/app/machinelearning.bicep
@@ -21,7 +21,7 @@ resource machineLearningWorkspace 'Microsoft.MachineLearningServices/workspaces@
   }
 }
 
-resource aisearch_connection 'Microsoft.MachineLearningServices/workspaces/connections@2024-01-01-preview' = {
+resource aisearch_connection 'Microsoft.MachineLearningServices/workspaces/connections@2024-01-01-preview' = if (azureAISearchName != '') {
   parent: machineLearningWorkspace
   name: 'aisearch_connection'
   properties: {
@@ -42,7 +42,12 @@ resource aisearch_connection 'Microsoft.MachineLearningServices/workspaces/conne
   }
 }
 
-var azureOpenAIId = resourceId(subscription().subscriptionId, resourceGroup().name, 'Microsoft.CognitiveServices/accounts', azureOpenAIName)
+var azureOpenAIId = resourceId(
+  subscription().subscriptionId,
+  resourceGroup().name,
+  'Microsoft.CognitiveServices/accounts',
+  azureOpenAIName
+)
 
 resource openai_connection 'Microsoft.MachineLearningServices/workspaces/connections@2024-01-01-preview' = {
   parent: machineLearningWorkspace
@@ -61,4 +66,4 @@ resource openai_connection 'Microsoft.MachineLearningServices/workspaces/connect
   }
 }
 
-output workspaceName string = machineLearningWorkspace.name
+output workspaceName string = machineLearningWorkspace.name
diff --git a/infra/app/storekeys.bicep b/infra/app/storekeys.bicep
@@ -43,7 +43,7 @@ resource openAIKeySecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
   }
 }
 
-resource searchKeySecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = {
+resource searchKeySecret 'Microsoft.KeyVault/vaults/secrets@2022-07-01' = if (azureAISearchName != '') {
   parent: keyVault
   name: searchKeyName
   properties: {
@@ -135,7 +135,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
 
 output CONTENT_SAFETY_KEY_NAME string = contentSafetyKeySecret.name
 output FORM_RECOGNIZER_KEY_NAME string = formRecognizerKeySecret.name
-output SEARCH_KEY_NAME string = searchKeySecret.name
+output SEARCH_KEY_NAME string = azureAISearchName != '' ? searchKeySecret.name : ''
 output OPENAI_KEY_NAME string = openAIKeySecret.name
 output STORAGE_ACCOUNT_KEY_NAME string = storageAccountKeySecret.name
 output SPEECH_KEY_NAME string = speechKeySecret.name

diff --git a/infra/app/web.bicep b/infra/app/web.bicep
@@ -79,15 +79,17 @@ module web '../core/host/appservice.bicep' = {
             ).key1
         AZURE_SEARCH_KEY: useKeyVault
           ? searchKeyName
-          : listAdminKeys(
-              resourceId(
-                subscription().subscriptionId,
-                resourceGroup().name,
-                'Microsoft.Search/searchServices',
-                azureAISearchName
-              ),
-              '2021-04-01-preview'
-            ).primaryKey
+          : (azureAISearchName != ''
+              ? listAdminKeys(
+                  resourceId(
+                    subscription().subscriptionId,
+                    resourceGroup().name,
+                    'Microsoft.Search/searchServices',
+                    azureAISearchName
+                  ),
+                  '2021-04-01-preview'
+                ).primaryKey
+              : '')
         AZURE_BLOB_ACCOUNT_KEY: useKeyVault
           ? storageAccountKeyName
           : listKeys(