Fix serialization error and update chatbot type to "messages"

app.py

@@ -97,7 +97,7 @@ async def check_safety(message: str, metadata: dict) -> dict:
                   "app": "slmdr",
                   "app_environment": "stable",
                   "chat_model_id": model_args["model"],
-                  "mistral_results": mistral_results,
+                  "mistral_results": json.loads(json.dumps(mistral_results, default=str)),
                 } | metadata,
                 "detection_config": {
                     "safety": True,
@@ -122,15 +122,7 @@ async def bot_response(message, chat_history, system_prompt, selected_model):
         client.base_url = CHATBOT_MODELS[selected_model]["base_url"]
         model_args["model"] = CHATBOT_MODELS[selected_model]["model_path"]
 
-        messages = [{"role": "system", "content": system_prompt}]
-
-        for user_msg, assistant_msg in chat_history[:-1]:
-            messages.extend([
-                {"role": "user", "content": user_msg},
-                {"role": "assistant", "content": assistant_msg}
-            ])
-
-        messages.append({"role": "user", "content": message})
+        messages = [{"role": "system", "content": system_prompt}] + chat_history + [{"role": "user", "content": message}]
 
         stream = await client.chat.completions.create(
             **model_args,
@@ -138,35 +130,23 @@ async def bot_response(message, chat_history, system_prompt, selected_model):
         )
 
         full_response = ""
-        safety_task = None
-
-        new_history = chat_history.copy()
+        new_history = chat_history + [{"role": "user", "content": message}, {"role": "assistant", "content": ""}]
 
         async for chunk in stream:
             if chunk.choices[0].delta.content is not None:
                 content_delta = chunk.choices[0].delta.content
                 full_response += content_delta
-
-                new_history[-1][1] = full_response
+                new_history[-1]["content"] = full_response
                 yield new_history, ""
 
-        messages.append(
-            {
-                "role": "assistant",
-                "content": full_response
-            }
-        )
-        metadata = {
-            "messages": messages
-        }
+        metadata = {"messages": messages + [{"role": "assistant", "content": full_response}]}
         safety_results = await check_safety(full_response, metadata)
 
         yield new_history, safety_results
 
     except Exception as e:
         error_message = f"Error occurred: {str(e)}"
-        new_history = chat_history.copy()
-        new_history[-1][1] = error_message
+        new_history = chat_history + [{"role": "user", "content": message}, {"role": "assistant", "content": error_message}]
         yield new_history, ""
 
 
@@ -194,7 +174,7 @@ with gr.Blocks(title="🦎 Salamandra & Oranguten") as demo:
 
 
         with gr.Column(scale=3):
-            chatbot = gr.Chatbot(height=450)
+            chatbot = gr.Chatbot(height=450, type="messages")
             msg = gr.Textbox(placeholder="Type your message here...", label="Your message")
 
             with gr.Row():
@@ -210,7 +190,7 @@ with gr.Blocks(title="🦎 Salamandra & Oranguten") as demo:
         if not message:
             return "", chat_history
         # Add user message to chat history immediately with an empty assistant message
-        return "", chat_history + [[message, ""]]
+        return "", chat_history + [{"role": "user", "content": message}]
 
     def load_example_prompt(example_name):
         prompt = EXAMPLE_PROMPTS.get(example_name, EXAMPLE_PROMPTS["Default"])
@@ -243,7 +223,6 @@ with gr.Blocks(title="🦎 Salamandra & Oranguten") as demo:
         model_selector,
         current_model
     )
-
     new_chat.click(
         lambda: ([], EXAMPLE_PROMPTS["Default"], EXAMPLE_PROMPTS["Default"], "Default", "Salamandra", ""),
         None,