Address Matt's feedback

Author: pamelafox

app/backend/chat_history/cosmosdb.py

@@ -10,6 +10,7 @@
     CONFIG_CHAT_HISTORY_COSMOS_ENABLED,
     CONFIG_COSMOS_HISTORY_CLIENT,
     CONFIG_COSMOS_HISTORY_CONTAINER,
+    CONFIG_COSMOS_HISTORY_VERSION,
     CONFIG_CREDENTIAL,
 )
 from decorators import authenticated
@@ -43,6 +44,7 @@ async def post_chat_history(auth_claims: Dict[str, Any]):
         # Insert the session item:
         session_item = {
             "id": session_id,
+            "version": current_app.config[CONFIG_COSMOS_HISTORY_VERSION],
             "session_id": session_id,
             "entra_oid": entra_oid,
             "type": "session",
@@ -56,11 +58,13 @@ async def post_chat_history(auth_claims: Dict[str, Any]):
             message_pair_items.append(
                 {
                     "id": f"{session_id}-{ind}",
+                    "version": current_app.config[CONFIG_COSMOS_HISTORY_VERSION],
                     "session_id": session_id,
                     "entra_oid": entra_oid,
                     "type": "message_pair",
                     "question": message_pair[0],
                     "response": message_pair[1],
+                    "order": ind,
                     "timestamp": None,
                 }
             )
@@ -193,7 +197,7 @@ async def delete_chat_history_session(auth_claims: Dict[str, Any], session_id: s
 
     try:
         res = container.query_items(
-            query="SELECT * FROM c WHERE c.session_id = @session_id",
+            query="SELECT c.id FROM c WHERE c.session_id = @session_id",
             parameters=[dict(name="@entra_oid", value=entra_oid), dict(name="@session_id", value=session_id)],
             partition_key=[entra_oid, session_id],
         )
@@ -237,6 +241,7 @@ async def setup_clients():
 
         current_app.config[CONFIG_COSMOS_HISTORY_CLIENT] = cosmos_client
         current_app.config[CONFIG_COSMOS_HISTORY_CONTAINER] = cosmos_container
+        current_app.config[CONFIG_COSMOS_HISTORY_VERSION] = os.environ["AZURE_CHAT_HISTORY_VERSION"]
 
 
 @chat_history_cosmosdb_bp.after_app_serving

app/backend/config.py

@@ -26,3 +26,4 @@
 CONFIG_CHAT_HISTORY_COSMOS_ENABLED = "chat_history_cosmos_enabled"
 CONFIG_COSMOS_HISTORY_CLIENT = "cosmos_history_client"
 CONFIG_COSMOS_HISTORY_CONTAINER = "cosmos_history_container"
+CONFIG_COSMOS_HISTORY_VERSION = "cosmos_history_version"

app/frontend/src/components/LoginButton/LoginButton.tsx

@@ -35,7 +35,6 @@ export const LoginButton = () => {
             })
             .catch(error => console.log(error))
             .then(async () => {
-                debugger;
                 setLoggedIn(await checkLoggedIn(instance));
                 setUsername((await getUsername(instance)) ?? "");
             });

infra/main.bicep

@@ -70,7 +70,8 @@ param cosmosDbLocation string = ''
 param cosmosDbAccountName string = ''
 param cosmosDbThroughput int = 400
 param chatHistoryDatabaseName string = 'chat-database'
-param chatHistoryContainerName string = 'chat-history-container'
+param chatHistoryContainerName string = 'chat-history-v2'
+param chatHistoryVersion string = 'cosmosdb-v2'
 
 // https://learn.microsoft.com/azure/ai-services/openai/concepts/models?tabs=python-secure%2Cstandard%2Cstandard-chat-completions#standard-deployment-model-availability
 @description('Location for the OpenAI resource group')
@@ -375,6 +376,7 @@ var appEnvVariables = {
   AZURE_COSMOSDB_ACCOUNT: (useAuthentication && useChatHistoryCosmos) ? cosmosDb.outputs.name : ''
   AZURE_CHAT_HISTORY_DATABASE: chatHistoryDatabaseName
   AZURE_CHAT_HISTORY_CONTAINER: chatHistoryContainerName
+  AZURE_CHAT_HISTORY_VERSION: chatHistoryVersion
   // Shared by all OpenAI deployments
   OPENAI_HOST: openAiHost
   AZURE_OPENAI_EMB_MODEL_NAME: embedding.modelName
@@ -1215,6 +1217,7 @@ output AZURE_SEARCH_SERVICE_ASSIGNED_USERID string = searchService.outputs.princ
 output AZURE_COSMOSDB_ACCOUNT string = (useAuthentication && useChatHistoryCosmos) ? cosmosDb.outputs.name : ''
 output AZURE_CHAT_HISTORY_DATABASE string = chatHistoryDatabaseName
 output AZURE_CHAT_HISTORY_CONTAINER string = chatHistoryContainerName
+output AZURE_CHAT_HISTORY_VERSION string = chatHistoryVersion
 
 output AZURE_STORAGE_ACCOUNT string = storage.outputs.name
 output AZURE_STORAGE_CONTAINER string = storageContainerName