Refactor chat history formatting logic

app.py

@@ -86,12 +86,23 @@ with gr.Blocks() as demo:
         else:
             chat_history = user(message, chat_history)
         chat_history, _ = chat(chat_history, system_message, max_tokens.value, temperature.value, top_p.value, 40, 1.1)
+        
         formatted_chat_history = []
+        last_role = None
         for entry in chat_history:
-            if entry["role"] == "user":
-                formatted_chat_history.append([entry["content"], ""])
-            elif entry["role"] == "assistant":
-                formatted_chat_history.append(["", entry["content"]])
+            role = entry["role"]
+            if role != last_role:
+                if role == "user":
+                    formatted_chat_history.append([entry["content"], ""])
+                elif role == "assistant":
+                    formatted_chat_history.append(["", entry["content"]])
+                last_role = role
+            else:
+                if role == "user":
+                    formatted_chat_history[-1][0] += entry["content"]
+                else:
+                    formatted_chat_history[-1][1] += entry["content"]
+
         return formatted_chat_history, chat_history, ""
 
     submit.click(