Update app.py

app.py

@@ -292,13 +292,39 @@ hr { border-color: #1a1a2e !important; }
 ::-webkit-scrollbar-thumb { background: #1f2937; border-radius: 2px; }
 ::-webkit-scrollbar-thumb:hover { background: #3b82f6; }
 
-/* ── File uploader — compact, attached to input bar ── */
+/* ── Attachment toolbar (paperclip row above chat input) ── */
+.attach-toolbar {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.3rem 0.2rem 0.2rem 0.2rem;
+}
+.attach-btn {
+    background: transparent;
+    border: 1px solid #1f2937;
+    color: #4b5563;
+    border-radius: 8px;
+    font-size: 0.78rem;
+    padding: 4px 10px;
+    cursor: pointer;
+    transition: all 0.15s;
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+}
+.attach-btn:hover {
+    border-color: #3b82f6;
+    color: #60a5fa;
+    background: #0f172a;
+}
+
+/* ── File uploader — compact popup style ── */
 [data-testid="stFileUploader"] {
     background: #111827 !important;
-    border: 1px solid #1f2937 !important;
-    border-bottom: none !important;
-    border-radius: 14px 14px 0 0 !important;
-    padding: 0.35rem 1rem !important;
+    border: 1px solid #2a3a5e !important;
+    border-radius: 12px !important;
+    padding: 0.5rem 1rem 0.4rem 1rem !important;
+    margin-bottom: 0.4rem !important;
     transition: all 0.2s ease !important;
 }
 [data-testid="stFileUploader"]:hover {
@@ -310,38 +336,47 @@ hr { border-color: #1a1a2e !important; }
     border: none !important;
     background: transparent !important;
 }
-[data-testid="stFileUploader"] label {
-    font-size: 0.78rem !important;
-    color: #4b5563 !important;
-    transition: color 0.2s !important;
-}
-[data-testid="stFileUploader"]:hover label {
-    color: #60a5fa !important;
-}
 [data-testid="stFileUploaderDropzone"] {
     background: transparent !important;
-    border: none !important;
-    padding: 0.1rem 0 !important;
+    border: 1px dashed #2a3a5e !important;
+    border-radius: 8px !important;
+    padding: 0.5rem 0.5rem !important;
     min-height: 0 !important;
     transition: all 0.2s !important;
 }
 [data-testid="stFileUploaderDropzone"]:hover {
-    background: rgba(59,130,246,0.05) !important;
-    border-radius: 8px !important;
+    background: rgba(59,130,246,0.06) !important;
+    border-color: #3b82f6 !important;
 }
 [data-testid="stFileUploaderDropzoneInstructions"] {
     font-size: 0.75rem !important;
     color: #4b5563 !important;
-    padding: 0.2rem 0 !important;
+    padding: 0.15rem 0 !important;
 }
-/* Input bar connects seamlessly below uploader */
+/* ── Chat input — always rounded ── */
 [data-testid="stChatInput"] {
-    border-radius: 0 0 14px 14px !important;
-    border-top: 1px solid #1f2937 !important;
+    border-radius: 14px !important;
+    border: 1px solid #1f2937 !important;
 }
 [data-testid="stChatInput"]:focus-within {
     border-color: #3b82f6 !important;
 }
+/* Hide "Browse files" button text, keep icon feel */
+[data-testid="stFileUploaderDropzone"] button {
+    font-size: 0.72rem !important;
+    padding: 3px 10px !important;
+    border-radius: 6px !important;
+    background: #0f172a !important;
+    border: 1px solid #2a3a5e !important;
+    color: #60a5fa !important;
+}
+/* Compact upload section toggle button */
+div[data-testid="column"] .stButton > button[kind="secondary"] {
+    padding: 4px 10px !important;
+    font-size: 0.78rem !important;
+    width: auto !important;
+    border-radius: 8px !important;
+}
 </style>
 """, unsafe_allow_html=True)
 
@@ -354,11 +389,13 @@ if "messages" not in st.session_state:
 if "last_submitted" not in st.session_state:
     st.session_state.last_submitted = ""
 if "chats" not in st.session_state:
-    st.session_state.chats = {}  # Will load from Supabase after functions defined
+    st.session_state.chats = {}
 if "supa_loaded" not in st.session_state:
     st.session_state.supa_loaded = False
 if "current_chat_id" not in st.session_state:
     st.session_state.current_chat_id = None
+if "show_uploader" not in st.session_state:
+    st.session_state.show_uploader = False
 
 # ════════════════════════════════════════════════════════════════════
 # SUPABASE — Persistent chat history
@@ -1798,16 +1835,32 @@ def ask_ai(problem: str, sympy_info: dict, history: list) -> str:
         for m in user_msgs:
             role = "user" if m["role"]=="user" else "model"
             contents.append({"role": role, "parts": [{"text": m["content"]}]})
-        resp = requests.post(
-            f"https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key={key}",
-            headers={"Content-Type": "application/json"},
-            json={"system_instruction": {"parts": [{"text": system_msg}]},
-                  "contents": contents,
-                  "generationConfig": {"maxOutputTokens": 2048, "temperature": 0.15}},
-            timeout=60
-        )
-        resp.raise_for_status()
-        return resp.json()["candidates"][0]["content"]["parts"][0]["text"]
+        payload = {
+            "system_instruction": {"parts": [{"text": system_msg}]},
+            "contents": contents,
+            "generationConfig": {"maxOutputTokens": 2048, "temperature": 0.15}
+        }
+        # Try 2.0-flash first, fall back to 1.5-flash if model not available
+        for model in ["gemini-2.0-flash", "gemini-1.5-flash"]:
+            resp = requests.post(
+                f"https://generativelanguage.googleapis.com/v1beta/models/{model}:generateContent?key={key}",
+                headers={"Content-Type": "application/json"},
+                json=payload,
+                timeout=60
+            )
+            if resp.status_code == 404:
+                continue  # model not found — try next model
+            if not resp.ok:
+                # Attach real error body to the exception so the caller can log it
+                try:
+                    err_msg = resp.json().get("error", {}).get("message", resp.text[:100])
+                except Exception:
+                    err_msg = resp.text[:100]
+                resp._content = f"{resp.status_code}: {err_msg}".encode()
+                resp.raise_for_status()
+            return resp.json()["candidates"][0]["content"]["parts"][0]["text"]
+        # Both models failed with 404
+        raise requests.exceptions.HTTPError("Both gemini-2.0-flash and gemini-1.5-flash returned 404")
 
     def try_openrouter(key, messages):
         resp = requests.post(
@@ -2141,10 +2194,12 @@ def ask_ai(problem: str, sympy_info: dict, history: list) -> str:
             continue
         except requests.exceptions.HTTPError as e:
             code = e.response.status_code if e.response else 0
-            # Skip to next provider for ALL these codes:
-            # 429 = rate limit, 401 = invalid key, 402 = no credits
-            # 403 = forbidden, 503 = service down, 500 = server error
-            last_error = f"⚠️ {provider_name} HTTP {code}"
+            # Include the real error body if available (set by try_gemini)
+            try:
+                body = e.response.text[:120] if e.response else str(e)
+            except Exception:
+                body = str(e)[:120]
+            last_error = f"⚠️ {provider_name} HTTP {code}: {body}"
             continue  # always try next provider
         except Exception as e:
             last_error = f"⚠️ {provider_name} error: {str(e)}"
@@ -2152,10 +2207,11 @@ def ask_ai(problem: str, sympy_info: dict, history: list) -> str:
 
     # All providers exhausted
     return (
-        f"⚠️ **All API limits reached.**\n\n"
-        f"Last error: {last_error}\n\n"
-        "All 6 providers (3×Groq, 2×Gemini, OpenRouter) are at their daily limit.\n"
-        "Limits reset every 24 hours. Please try again tomorrow! 🔄"
+        f"⚠️ **All providers failed.**\n\n"
+        f"Last error: `{last_error}`\n\n"
+        "Tried: 3×Groq → 4×Gemini → OpenRouter. All failed or rate-limited.\n"
+        "If you see `API not enabled` — visit [aistudio.google.com](https://aistudio.google.com/app/apikey) and enable the Generative Language API for your account.\n"
+        "If you see `quota exceeded` — wait 60 seconds (rate limit) or until midnight Pacific (daily limit)."
     )
 
 
@@ -2195,48 +2251,85 @@ def ask_gemini_vision(image_b64: str, mime_type: str, user_note: str) -> str:
         f"Additional note from student: {user_note if user_note else 'None'}"
     )
 
+    # Try gemini-2.0-flash first, fall back to gemini-1.5-flash per key
+    # (new Google accounts sometimes can't access 2.0 yet)
+    models_to_try = ["gemini-2.0-flash", "gemini-1.5-flash"]
+
     last_error = ""
     for i, key in enumerate(gemini_keys):
         if not key.strip():
             continue
-        try:
-            resp = requests.post(
-                f"https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:generateContent?key={key}",
-                headers={"Content-Type": "application/json"},
-                json={
-                    "contents": [{
-                        "parts": [
-                            {"inline_data": {"mime_type": mime_type, "data": image_b64}},
-                            {"text": prompt}
-                        ]
-                    }],
-                    "generationConfig": {"maxOutputTokens": 2048, "temperature": 0.15}
-                },
-                timeout=60
-            )
-            if resp.status_code == 200:
-                data = resp.json()
-                candidates = data.get("candidates", [])
-                if not candidates:
-                    last_error = f"Key {i+1}: blocked by safety filter"
-                    continue
-                return candidates[0]["content"]["parts"][0]["text"]
-            elif resp.status_code == 429:
-                last_error = f"Key {i+1}: quota exceeded (429)"
-                continue
-            else:
-                last_error = f"Key {i+1}: HTTP {resp.status_code}"
-                continue
-        except requests.exceptions.Timeout:
-            last_error = f"Key {i+1}: timed out"
-            continue
-        except Exception as e:
-            last_error = f"Key {i+1}: {str(e)}"
-            continue
+        for model in models_to_try:
+            try:
+                resp = requests.post(
+                    f"https://generativelanguage.googleapis.com/v1beta/models/{model}:generateContent?key={key}",
+                    headers={"Content-Type": "application/json"},
+                    json={
+                        "contents": [{
+                            "parts": [
+                                {"inline_data": {"mime_type": mime_type, "data": image_b64}},
+                                {"text": prompt}
+                            ]
+                        }],
+                        "generationConfig": {"maxOutputTokens": 2048, "temperature": 0.15}
+                    },
+                    timeout=60
+                )
+                if resp.status_code == 200:
+                    data = resp.json()
+                    candidates = data.get("candidates", [])
+                    if not candidates:
+                        last_error = f"Key {i+1}/{model}: blocked by safety filter"
+                        break  # try next key
+                    return candidates[0]["content"]["parts"][0]["text"]
+                elif resp.status_code == 429:
+                    last_error = f"Key {i+1}/{model}: quota exceeded (429)"
+                    break  # rate-limited on this key — try next key
+                elif resp.status_code in (400, 403, 404):
+                    # Capture the actual error body so user can diagnose
+                    try:
+                        err_detail = resp.json().get("error", {}).get("message", resp.text[:120])
+                    except Exception:
+                        err_detail = resp.text[:120]
+                    last_error = f"Key {i+1}/{model}: HTTP {resp.status_code} — {err_detail}"
+                    # 404 = model not found, try next model in list
+                    if resp.status_code == 404:
+                        continue  # try next model
+                    break  # 400/403 = key issue — try next key
+                else:
+                    try:
+                        err_detail = resp.json().get("error", {}).get("message", "")[:80]
+                    except Exception:
+                        err_detail = ""
+                    last_error = f"Key {i+1}/{model}: HTTP {resp.status_code} {err_detail}"
+                    break
+            except requests.exceptions.Timeout:
+                last_error = f"Key {i+1}/{model}: timed out"
+                break
+            except Exception as e:
+                last_error = f"Key {i+1}/{model}: {str(e)}"
+                break
 
     if "429" in last_error or "quota" in last_error:
-        return "⚠️ **All Gemini keys rate-limited.** Please wait a minute and try again."
-    return f"⚠️ **Could not process image.** ({last_error})"
+        return (
+            "⚠️ **All Gemini keys are rate-limited.**\n\n"
+            "Free tier resets every minute (15 req/min) and daily at midnight Pacific.\n"
+            "Wait 60 seconds and try again."
+        )
+    if "API_KEY_INVALID" in last_error or "403" in last_error:
+        return (
+            f"⚠️ **Gemini key rejected.**\n\n"
+            f"Error: `{last_error}`\n\n"
+            "**How to fix:** Go to [Google AI Studio](https://aistudio.google.com/app/apikey), "
+            "create a key, and make sure the **Generative Language API** is enabled in your "
+            "Google Cloud project."
+        )
+    return (
+        f"⚠️ **Could not process image.**\n\n"
+        f"Last error: `{last_error}`\n\n"
+        "If you see `API not enabled` or `permission denied`: go to "
+        "[aistudio.google.com](https://aistudio.google.com/app/apikey) and enable the API for your account."
+    )
 
 
 def handle_uploaded_file(uploaded_file, user_note: str) -> str:
@@ -2615,20 +2708,33 @@ for i, msg in enumerate(st.session_state.messages):
                 st.code(msg["content"], language=None)
 
 # ════════════════════════════════════════════════════════════════════
-# FILE UPLOAD — above chat input
+# FILE UPLOAD — ChatGPT-style: paperclip toggle above input bar
 # ════════════════════════════════════════════════════════════════════
-uploaded_file = st.file_uploader(
-    "📎 Upload a math problem (image or PDF)",
-    type=["jpg", "jpeg", "png", "webp", "pdf"],
-    label_visibility="collapsed",
-    help="Upload a photo or PDF of your math problem — Saad.AI will read and solve it"
-)
+
+# Toolbar row: paperclip button (left-aligned, compact)
+col_attach, col_spacer = st.columns([1, 8])
+with col_attach:
+    attach_label = "📎 Attach" if not st.session_state.show_uploader else "✕ Close"
+    if st.button(attach_label, key="attach_toggle", help="Upload image or PDF"):
+        st.session_state.show_uploader = not st.session_state.show_uploader
+        st.rerun()
+
+# Compact uploader — only visible when toggled ON
+uploaded_file = None
+if st.session_state.show_uploader:
+    uploaded_file = st.file_uploader(
+        "Upload image or PDF of your math problem",
+        type=["jpg", "jpeg", "png", "webp", "pdf"],
+        label_visibility="collapsed",
+        help="JPG · PNG · WEBP · PDF — max 5 MB"
+    )
 
 if uploaded_file:
     # Use size+type as key — works with ANY filename including spaces/brackets
     file_key = f"{uploaded_file.size}_{uploaded_file.type}"
     if file_key != st.session_state.get("last_uploaded_file", ""):
         st.session_state["last_uploaded_file"] = file_key
+        st.session_state.show_uploader = False  # auto-close after upload
         user_note = ""
 
         with st.chat_message("user", avatar="🧑‍🎓"):
@@ -2651,13 +2757,12 @@ if uploaded_file:
         save_current_chat()
 
 # ════════════════════════════════════════════════════════════════════
-# INPUT — use st.chat_input (cleaner than text_input + button)
+# INPUT — ChatGPT-style input bar
 # ════════════════════════════════════════════════════════════════════
 
 # Pre-fill from example selector
 prefill = examples.get(selected, "") if selected != "-- Select --" else ""
 
-# st.chat_input is the clean ChatGPT-style input bar
 user_input = st.chat_input(
     placeholder="Type a BSc math problem... e.g. 'Solve d²y/dx² + 4y = cos(2x)'",
 )