pass through chat history

microsoft · Jul 10, 2024 · a12c4c9 · a12c4c9
1 parent 21f0448
commit a12c4c9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/app.py b/app.py
@@ -197,12 +197,22 @@ def prepare_model_args(request_body, request_headers):
 
     for message in request_messages:
         if message:
-            messages.append(
-                {
-                    "role": message["role"],
-                    "content": message["content"]
-                }
-            )
+            if message["role"] == "assistant" and "context" in message:
+                context_obj = json.loads(message["context"])
+                messages.append(
+                    {
+                        "role": message["role"],
+                        "content": message["content"],
+                        "context": context_obj
+                    }
+                )
+            else:
+                messages.append(
+                    {
+                        "role": message["role"],
+                        "content": message["content"]
+                    }
+                )
 
     user_json = None
     if (MS_DEFENDER_ENABLED):

diff --git a/frontend/src/pages/chat/Chat.tsx b/frontend/src/pages/chat/Chat.tsx
@@ -129,13 +129,16 @@ const Chat = () => {
     if (resultMessage.content.includes('all_exec_results')) {
       const parsedExecResults = JSON.parse(resultMessage.content) as AzureSqlServerExecResults
       setExecResults(parsedExecResults.all_exec_results)
+      assistantMessage.context = JSON.stringify({
+        all_exec_results: parsedExecResults.all_exec_results
+      })
     }
 
     if (resultMessage.role === ASSISTANT) {
       assistantContent += resultMessage.content
-      assistantMessage = resultMessage
+      assistantMessage = {...assistantMessage, ...resultMessage}
       assistantMessage.content = assistantContent
-
+      
       if (resultMessage.context) {
         toolMessage = {
           id: uuid(),

diff --git a/static/assets/index-793cfb21.js → static/assets/index-8b71dadf.js b/static/assets/index-793cfb21.js → static/assets/index-8b71dadf.js
diff --git a/static/assets/index-793cfb21.js.map → static/assets/index-8b71dadf.js.map b/static/assets/index-793cfb21.js.map → static/assets/index-8b71dadf.js.map
diff --git a/static/index.html b/static/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/x-icon" href="{{ favicon }}" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="/assets/index-793cfb21.js"></script>
+    <script type="module" crossorigin src="/assets/index-8b71dadf.js"></script>
     <link rel="stylesheet" href="/assets/index-61492790.css">
   </head>
   <body>