Refactor chat history formatting in app.py

app.py

@@ -86,28 +86,15 @@ 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:
-            role = entry["role"]
-            content = entry["content"].strip()  # Trim whitespace to check for empty content
-            if content:  # Only proceed if content is not empty
-                if role != last_role:
-                    if role == "user":
-                        formatted_chat_history.append([content, ""])
-                    elif role == "assistant":
-                        formatted_chat_history.append(["", content])
-                    last_role = role
-                else:
-                    if role == "user" and content:
-                        formatted_chat_history[-1][0] += "\n" + content
-                    elif role == "assistant" and content:
-                        formatted_chat_history[-1][1] += "\n" + content
+        for user_msg, assistant_msg in zip([msg["content"].strip() for msg in chat_history if msg["role"] == "user"],
+                                        [msg["content"].strip() for msg in chat_history if msg["role"] == "assistant"]):
+            if user_msg or assistant_msg:  # Verify if either message is not empty
+                formatted_chat_history.append([user_msg, assistant_msg])
 
         return formatted_chat_history, chat_history, ""
 
-
     submit.click(
         fn=update_chatbot,
         inputs=[message, chat_history_state],