Merge branch 'microsoft:main' into main

microsoft · Sep 17, 2024 · 55cc6df · 55cc6df
2 parents 552e82b + 6cdac4f
commit 55cc6df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/app.py b/app.py
@@ -239,8 +239,9 @@ def prepare_model_args(request_body, request_headers):
     user_json = None
     if (MS_DEFENDER_ENABLED):
         authenticated_user_details = get_authenticated_user_details(request_headers)
-        conversation_id = request_body.get("conversation_id", None)        
-        user_json = get_msdefender_user_json(authenticated_user_details, request_headers, conversation_id)
+        conversation_id = request_body.get("conversation_id", None)
+        application_name = app_settings.ui.title
+        user_json = get_msdefender_user_json(authenticated_user_details, request_headers, conversation_id, application_name)
 
     model_args = {
         "messages": messages,

diff --git a/backend/security/ms_defender_utils.py b/backend/security/ms_defender_utils.py
@@ -1,6 +1,6 @@
 import json
 
-def get_msdefender_user_json(authenticated_user_details, request_headers, conversation_id):
+def get_msdefender_user_json(authenticated_user_details, request_headers, conversation_id, application_name):
     auth_provider = authenticated_user_details.get('auth_provider')
     source_ip = request_headers.get('Remote-Addr', '')
     header_names = ['User-Agent', 'X-Forwarded-For', 'Forwarded', 'X-Real-IP', 'True-Client-IP', 'CF-Connecting-IP']
@@ -10,5 +10,6 @@ def get_msdefender_user_json(authenticated_user_details, request_headers, conver
         "SourceIp": source_ip.split(':')[0], #remove port
         "SourceRequestHeaders": {header: request_headers[header] for header in header_names if header in request_headers},
         "ConversationId": conversation_id,
+        "ApplicationName": application_name,
     }
-    return json.dumps(user_args)
+    return json.dumps(user_args)
diff --git a/backend/utils.py b/backend/utils.py
@@ -166,10 +166,12 @@ def format_pf_non_streaming_response(
                 "content": chatCompletion[response_field_name] 
             })
         if citations_field_name in chatCompletion:
+            citation_content= {"citations": chatCompletion[citations_field_name]}
             messages.append({ 
                 "role": "tool",
-                "content": chatCompletion[citations_field_name]
+                "content": json.dumps(citation_content)
             })
+
         response_obj = {
             "id": chatCompletion["id"],
             "model": "",

diff --git a/infra/main.bicep b/infra/main.bicep
@@ -200,7 +200,7 @@ module cosmos 'db.bicep' = {
   scope: resourceGroup
   params: {
     accountName: !empty(cosmosAccountName) ? cosmosAccountName : '${abbrs.documentDBDatabaseAccounts}${resourceToken}'
-    location: 'eastus'
+    location: resourceGroup.location
     tags: tags
     principalIds: [principalId, backend.outputs.identityPrincipalId]
   }