Update app.py

app.py

@@ -158,105 +158,158 @@ def generate_response(user_input, history, mode="chat"):
 # ---------------------------
 # 7. Gradio Chat UI
 # ---------------------------
+import traceback
 import gradio as gr
-from typing import List, Tuple
 
-# --- Core Chat Logic ---
-def chat_with_model(message: str, history: List[Tuple[str, str]]):
-    if history is None:
-        history = []
+# ---------------------------
+# Chat Logic
+# ---------------------------
 
-    system_message = "You are OhamLab AI, a professional assistant for research and engineering."
 
-    # Build structured message history
-    messages = [{"role": "system", "content": system_message}]
-    for user_msg, bot_msg in history:
-        if user_msg:
-            messages.append({"role": "user", "content": user_msg})
-        if bot_msg:
-            messages.append({"role": "assistant", "content": bot_msg})
 
-    # Add current user input
-    messages.append({"role": "user", "content": message})
+def chat_with_model(user_message, chat_history):
+    """
+    Maintains full conversational context and returns updated chat history.
+    The assistant speaks as 'OhamLab'.
+    """
+    if not user_message:
+        return chat_history, ""
 
-    # Placeholder: Replace with your model inference (RAG, etc.)
-    bot_reply = f"OhamLab: {message[::-1]}"  # simulate intelligent response
+    if chat_history is None:
+        chat_history = []
+
+    # Convert Gradio message list (dict-based) to usable context
+    history = [
+        {"role": m["role"], "content": m["content"]}
+        for m in chat_history
+        if isinstance(m, dict) and "role" in m
+    ]
+
+    # Append current user message
+    history.append({"role": "user", "content": user_message})
+
+    try:
+        bot_reply = generate_response(user_message, history)
+    except Exception as e:
+        tb = traceback.format_exc()
+        bot_reply = f"⚠️ OhamLab encountered an error:\n\n{e}\n\n{tb}"
+
+    # Add OhamLab's response as assistant role
+    history.append({"role": "assistant", "content": bot_reply})
 
-    # Append to history (user msg, bot reply)
-    history.append((message, bot_reply))
     return history, ""
 
 
 def reset_chat():
+    """Resets the chat session."""
     return []
 
 
-# --- Professional OhamLab Chat UI ---
+# ---------------------------
+# Gradio Chat UI
+# ---------------------------
+
 def build_ui():
     with gr.Blocks(
-        theme=gr.themes.Soft(),
+        theme=gr.themes.Soft(primary_hue="indigo"),
         css="""
-        /* Hide share/delete icons */
-        #ohamlab .wrap.svelte-1lcyrj3 > div > div > button {
-            display: none !important;
-        }
-
-        /* Chat alignment and bubble styling */
-        #ohamlab .message.user {
-            background-color: #0047AB !important;
-            color: white !important;
-            border-radius: 16px !important;
-            align-self: flex-end !important;
-            text-align: right !important;
-            margin-left: 20%;
-        }
-
-        #ohamlab .message.bot {
-            background-color: #f2f2f2 !important;
-            color: #111 !important;
-            border-radius: 16px !important;
-            align-self: flex-start !important;
-            text-align: left !important;
-            margin-right: 20%;
-        }
-
-        /* General layout tweaks */
-        .message-box {
-            width: 100%;
-        }
+            /* --- Hide share/delete icons --- */
+            #ohamlab .wrap.svelte-1lcyrj3 > div > div > button {
+                display: none !important;
+            }
+
+            /* --- User (Right) Message Bubble --- */
+            #ohamlab .message.user {
+                background-color: #4f46e5 !important;
+                color: white !important;
+                border-radius: 14px !important;
+                align-self: flex-end !important;
+                text-align: right !important;
+                margin-left: 25%;
+            }
+
+            /* --- OhamLab (Left) Message Bubble --- */
+            #ohamlab .message.assistant {
+                background-color: #f8f9fa !important;
+                color: #111 !important;
+                border-radius: 14px !important;
+                align-self: flex-start !important;
+                text-align: left !important;
+                margin-right: 25%;
+            }
+
+            /* --- Overall Container --- */
+            .gradio-container {
+                max-width: 900px !important;
+                margin: auto;
+                padding-top: 1.5rem;
+            }
+            textarea {
+                resize: none !important;
+                border-radius: 12px !important;
+                border: 1px solid #d1d5db !important;
+                box-shadow: 0 1px 3px rgba(0,0,0,0.08);
+            }
+            button.primary {
+                background-color: #4f46e5 !important;
+                color: white !important;
+                border-radius: 10px !important;
+                padding: 0.6rem 1.4rem !important;
+                font-weight: 600;
+                transition: all 0.2s ease-in-out;
+            }
+            button.primary:hover {
+                background-color: #4338ca !important;
+            }
+            button.secondary {
+                background-color: #f3f4f6 !important;
+                border-radius: 10px !important;
+                color: #374151 !important;
+                font-weight: 500;
+                transition: all 0.2s ease-in-out;
+            }
+            button.secondary:hover {
+                background-color: #e5e7eb !important;
+            }
         """,
     ) as demo:
+        # Header
         gr.Markdown(
             """
-            <div style='text-align:center;'>
-                <h2 style='color:#0047AB;'>🤖 OhamLab AI Assistant</h2>
-                <p style='color:gray;'>Your trusted partner in advanced R&D and AI innovation.</p>
+            <div style="text-align:center; margin-bottom: 1rem;">
+                <h2 style="font-weight:700; font-size:1.8rem;">💠 OhamLab AI Assistant</h2>
+                <p style="color:#6b7280; font-size:0.95rem;">
+                    Your intelligent R&D and engineering companion — powered by OhamLab contextual knowledge.
+                </p>
             </div>
             """
         )
 
+        # Chatbot area
         chatbot = gr.Chatbot(
-            label="💠 OhamLabAI",
+            label="💠 OhamLab Conversation",
+            height=520,
             elem_id="ohamlab",
-            
-            height=540,
-            bubble_full_width=False,
-            show_copy_button=False,
-            avatar_images=[None, None],
+            type="messages",
+            avatar_images=("🧑‍💻", "💠"),  # (user, bot)
         )
 
-        with gr.Row(equal_height=False):
+        # Input box (full width)
+        with gr.Row():
             msg = gr.Textbox(
-                placeholder="Type your message here...",
+                placeholder="Ask OhamLab anything about R&D, AI, or engineering...",
                 lines=3,
                 show_label=False,
-                elem_classes="message-box",
+                scale=12,
+                container=False,
             )
 
-        with gr.Row():
-            send = gr.Button("Send", variant="primary")
-            clear = gr.Button("Clear")
+        # Buttons (Send + Clear)
+        with gr.Row(equal_height=True, variant="compact"):
+            send = gr.Button("Send", variant="primary", elem_classes=["primary"])
+            clear = gr.Button("Clear", variant="secondary", elem_classes=["secondary"])
 
+        # Wiring
         send.click(chat_with_model, inputs=[msg, chatbot], outputs=[chatbot, msg])
         msg.submit(chat_with_model, inputs=[msg, chatbot], outputs=[chatbot, msg])
         clear.click(reset_chat, outputs=chatbot)
@@ -264,7 +317,11 @@ def build_ui():
     return demo
 
 
+# ---------------------------
+# Entrypoint
+# ---------------------------
 if __name__ == "__main__":
+    print("🚀 Starting OhamLab Assistant...")
     demo = build_ui()
     demo.launch(server_name="0.0.0.0", server_port=7860)