Update app.py

app.py

@@ -1,215 +1,191 @@
 import gradio as gr
 import requests
 from html import escape
-
-# API configurations
-DEEPSEEK_API_URL = "https://typegpt-api.aham2.com/v1/chat/completions"  # TypeGPT API for deepseek-r1
-DEFAULT_API_URL = "https://aham2api-3.onrender.com/v1/chat/completions"  # Default API for other models
-
-# List of available models
-AVAILABLE_MODELS = [
-    "deepseek-r1",
-    "gpt-4o",
-    "gpt-4o-latest",
-    "chatgpt-4o-latest",
-    "gemini-1.5-pro",
-    "gemini-1.5-pro-latest",
-    "gemini-flash-2.0",
-    "gemini-1.5-flash",
-    "claude-3-5-sonnet",
-    "claude-3-5-sonnet-20240620",
-    "anthropic/claude-3.5-sonnet",
-    "mistral-large",
-    "deepseek-v3",
-    "llama-3.1-405b",
-    "Meta-Llama-3.1-405B-Instruct-Turbo",
-    "Meta-Llama-3.3-70B-Instruct-Turbo",
-    "grok-2",
-    "qwen-plus-latest",
-    "qwen-turbo-latest",
-    "dbrx-instruct",
-    "claude",
-    "qwen-2.5-32b",
-    "qwen-2.5-coder-32b",
-    "qwen-qwq-32b",
-    "gemma2-9b-it",
-    "deepseek-r1-distill-llama-70b",
-    "o3-mini",
-    "Claude-sonnet-3.7",
-    "type/deepseek-r1",
-    "samu/deepseek-r1"
-]
-
-def get_api_url(model_name):
-    """Determine which API endpoint to use based on model selection"""
-    if model_name.lower() in ["deepseek-r1", "type/deepseek-r1", "samu/deepseek-r1"]:
-        return DEEPSEEK_API_URL
-    return DEFAULT_API_URL
-
-def convert_latex(text):
-    """Convert LaTeX expressions to HTML for rendering"""
-    # Handle block equations
-    text = text.replace('$$', '</p><div class="latex-block">')
-    text = text.replace('\\[', '</p><div class="latex-block">')
-    text = text.replace('\\]', '</div><p>')
-    
-    # Handle inline equations
-    text = text.replace('$', '<span class="latex-inline">')
-    text = text.replace('\\(', '<span class="latex-inline">')
-    text = text.replace('\\)', '</span>')
-    
-    return text
-
-def postprocess_message(message):
-    """Process message for HTML display with LaTeX support"""
-    if not message:
-        return ""
-    
-    # Escape HTML first for security
-    message = escape(message)
-    
-    # Convert LaTeX expressions
-    message = convert_latex(message)
-    
-    # Handle newlines
-    message = message.replace('\n', '<br>')
-    
-    return f'<div class="message-content">{message}</div>'
-
-def chat_with_aham(user_message, history, selected_model):
-    if not user_message.strip():
-        return "Please enter a message.", history
-    
-    # Prepare the conversation history for the API
-    messages = []
-    
-    # Add previous conversation history
-    for user_msg, ai_msg in history:
-        messages.append({"role": "user", "content": user_msg})
-        messages.append({"role": "assistant", "content": ai_msg})
-    
-    # Add the current user message
-    messages.append({"role": "user", "content": user_message})
-
-    payload = {
-        "model": selected_model,
-        "messages": messages,
-        "temperature": 0.7
-    }
-
-    headers = {"Content-Type": "application/json"}
-    api_url = get_api_url(selected_model)
-
-    try:
-        response = requests.post(api_url, json=payload, headers=headers)
-
-        if response.status_code == 200:
-            data = response.json()
-            ai_response = data.get("choices", [{}])[0].get("message", {}).get("content", "No response received.")
-            
-            # Append the current interaction to history
-            history.append((user_message, ai_response))
-            return "", history  # Clear input, return updated history
-        else:
-            error_msg = f"Error: {response.status_code}, {response.text}"
-            history.append((user_message, error_msg))
-            return "", history
-    
-    except Exception as e:
-        error_msg = f"Error: {str(e)}"
-        history.append((user_message, error_msg))
-        return "", history
-
-# Custom CSS for LaTeX rendering and chat interface
-custom_css = """
+import re
+from typing import List, Tuple
+
+# API endpoints
+API_URL = "https://aham2api-3.onrender.com/v1/chat/completions"
+MODELS_URL = "https://aham2api-3.onrender.com/v1/models"
+
+# Enhanced CSS with wider layout and better LaTeX support
+css = """
+.gradio-container {
+    max-width: 1000px !important;
+    margin: 0 auto;
+    padding: 0 !important;
+}
+.chat-container {
+    display: flex;
+    flex-direction: column;
+    height: 85vh;
+    gap: 0;
+}
+.chatbot {
+    flex-grow: 1;
+    overflow-y: auto;
+    border: none;
+    border-radius: 0;
+    padding: 12px 20px !important;
+    margin: 0;
+    background: transparent;
+    width: 100% !important;
+}
+.input-container {
+    display: flex;
+    gap: 8px;
+    padding: 12px 0;
+    background: white;
+    position: sticky;
+    bottom: 0;
+    width: 100%;
+}
+.message {
+    padding: 10px 16px;
+    border-radius: 8px;
+    margin: 6px 0;
+    max-width: 90%;
+    line-height: 1.5;
+    font-size: 15.5px;
+}
+.user-message {
+    background: #f0f7ff;
+    margin-left: auto;
+    border-bottom-right-radius: 0;
+}
+.bot-message {
+    background: #f7f7f8;
+    margin-right: auto;
+    border-bottom-left-radius: 0;
+}
 .latex-block {
-    padding: 10px;
+    background: #f8f9fa;
+    padding: 14px;
     margin: 10px 0;
-    background-color: #f5f5f5;
-    border-radius: 5px;
+    border-radius: 6px;
     overflow-x: auto;
-    text-align: center;
-    font-family: monospace;
+    font-size: 16px;
 }
-
 .latex-inline {
-    background-color: #f0f0f0;
-    padding: 2px 4px;
-    border-radius: 3px;
-    font-family: monospace;
-}
-
-.message-content {
-    line-height: 1.6;
+    background: #f0f0f0;
+    padding: 2px 6px;
+    border-radius: 4px;
+    font-size: 16px;
 }
-
-.dark .latex-block, .dark .latex-inline {
-    background-color: #2d2d2d;
-}
-
 #chatbot {
-    min-height: 500px;
+    padding: 15px 25px !important;
 }
-
-.model-info {
-    font-size: 0.9em;
-    color: #666;
-    margin-top: 5px;
+#component-2 {
+    min-height: 42px !important;
+    font-size: 15px;
+}
+.model-dropdown {
+    margin-bottom: 10px !important;
 }
 """
 
-# Gradio UI with ChatInterface
-with gr.Blocks(title="Aham AI Chat", css=custom_css) as demo:
-    gr.Markdown("## Chat with Aham AI (with LaTeX support)")
+def get_available_models() -> List[str]:
+    try:
+        response = requests.get(MODELS_URL, timeout=10)
+        response.raise_for_status()
+        models_data = response.json()
+        return sorted([model['id'] for model in models_data.get('data', [])])
+    except Exception:
+        return ["samura-gpt-4o", "samura-claude-3-5-sonnet"]
+
+def chat_completion(messages: List[dict], model: str) -> dict:
+    headers = {"Content-Type": "application/json"}
+    data = {
+        "model": model,
+        "messages": messages,
+        "temperature": 0.7,
+        "max_tokens": 2500
+    }
+    try:
+        response = requests.post(API_URL, headers=headers, json=data, timeout=40)
+        response.raise_for_status()
+        return response.json()
+    except Exception as e:
+        return {"error": str(e)}
+
+def format_message(text: str) -> str:
+    text = escape(text)
+    # Enhanced LaTeX processing
+    text = re.sub(r'\$(.*?)\$', r'<span class="latex-inline">\(\1\)</span>', text)
+    text = re.sub(r'\$\$(.*?)\$\$', r'<div class="latex-block">\[\1\]</div>', text, flags=re.DOTALL)
+    return text.replace("\n", "<br>")
+
+def respond(message: str, chat_history: List[Tuple[str, str]], model: str):
+    if not message.strip():
+        return chat_history, ""
+    
+    # Add user message
+    user_message_html = format_message(message)
+    chat_history.append((user_message_html, ""))
     
+    # Prepare API messages
+    messages = []
+    for user_msg, bot_msg in chat_history[:-1]:
+        if user_msg:
+            clean_msg = re.sub('<[^<]+?>', '', user_msg).replace("<br>", "\n")
+            messages.append({"role": "user", "content": clean_msg})
+        if bot_msg:
+            clean_msg = re.sub('<[^<]+?>', '', bot_msg).replace("<br>", "\n")
+            messages.append({"role": "assistant", "content": clean_msg})
+    messages.append({"role": "user", "content": message})
+    
+    # Get response
+    response = chat_completion(messages, model)
+    bot_message = response.get("choices", [{}])[0].get("message", {}).get("content", "No response") if "error" not in response else f"Error: {response['error']}"
+    
+    # Update chat
+    chat_history[-1] = (chat_history[-1][0], format_message(bot_message))
+    return chat_history, ""
+
+with gr.Blocks(css=css, theme=gr.themes.Soft()) as app:
+    gr.Markdown("""<h1 style='text-align: center; margin-bottom: 12px; font-size: 22px;'>Advanced Math Chat</h1>""")
+    
+    # Model dropdown at top
     with gr.Row():
         model_dropdown = gr.Dropdown(
-            choices=AVAILABLE_MODELS,
-            value="deepseek-r1",
-            label="Select Model",
-            interactive=True
+            choices=get_available_models(),
+            value="samura-gpt-4o",
+            label="Model",
+            container=False,
+            elem_classes=["model-dropdown"],
+            scale=1,
+            min_width=250
         )
-        gr.Markdown("<div class='model-info'>deepseek-r1 uses TypeGPT API</div>")
     
+    # Chat area - wider with more space
     chatbot = gr.Chatbot(
-        height=500,
+        elem_id="chatbot",
         bubble_full_width=False,
-        render_markdown=True,
-        latex_delimiters=[
-            {"left": "$$", "right": "$$", "display": True},
-            {"left": "$", "right": "$", "display": False},
-            {"left": "\\(", "right": "\\)", "display": False},
-            {"left": "\\[", "right": "\\]", "display": True}
-        ]
-    )
-    
-    msg = gr.Textbox(
-        label="Your Message", 
-        placeholder="Type your message here... (use $ for inline LaTeX and $$ for block equations)",
-        lines=3
+        show_label=False,
+        avatar_images=(None, None),
+        height="100%",
+        layout="panel" 
     )
     
-    with gr.Row():
-        clear = gr.Button("Clear Conversation", variant="secondary")
-        submit = gr.Button("Send", variant="primary")
-    
-    examples = gr.Examples(
-        examples=[
-            ["What is the Pythagorean theorem?"],
-            ["Explain the formula $E = mc^2$"],
-            ["How do I solve this equation? $$\\int_0^1 x^2 dx$$"],
-            ["What's the derivative of $f(x) = \\sin(x)$?"]
-        ],
-        inputs=msg,
-        label="Example Questions (Click to try)"
-    )
+    # Input area - wider
+    with gr.Row(elem_classes=["input-container"]):
+        msg = gr.Textbox(
+            placeholder="Type your math question or equation...",
+            show_label=False,
+            container=False,
+            scale=9,
+            autofocus=True,
+            elem_id="component-2",
+            lines=2
+        )
+        submit_btn = gr.Button("Send", variant="primary", scale=1, min_width=100)
     
-    def respond(message, chat_history, model):
-        return chat_with_aham(message, chat_history, model)
+    # Clear button
+    clear_btn = gr.ClearButton([msg, chatbot], size="sm")
     
-    msg.submit(respond, [msg, chatbot, model_dropdown], [msg, chatbot])
-    submit.click(respond, [msg, chatbot, model_dropdown], [msg, chatbot])
-    clear.click(lambda: None, None, chatbot, queue=False)
+    # Event handlers
+    msg.submit(respond, [msg, chatbot, model_dropdown], [chatbot, msg])
+    submit_btn.click(respond, [msg, chatbot, model_dropdown], [chatbot, msg])
 
 if __name__ == "__main__":
-    demo.launch()
+    app.launch()