Update app.py

app.py

@@ -396,6 +396,12 @@ 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
+if "pending_file_bytes" not in st.session_state:
+    st.session_state.pending_file_bytes = None
+if "pending_file_name" not in st.session_state:
+    st.session_state.pending_file_name = None
+if "pending_file_mime" not in st.session_state:
+    st.session_state.pending_file_mime = None
 
 # ════════════════════════════════════════════════════════════════════
 # SUPABASE — Persistent chat history
@@ -2312,9 +2318,11 @@ def ask_gemini_vision(image_b64: str, mime_type: str, user_note: str) -> str:
 
     if "429" in last_error or "quota" in 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."
+            f"⚠️ **All Gemini keys are rate-limited.**\n\n"
+            f"Exact error: `{last_error}`\n\n"
+            "**Per-minute limit** (15 req/min): wait 60 seconds.\n"
+            "**Daily limit** (1500 req/day): resets at midnight Pacific — must wait until then.\n\n"
+            "Make sure each key is from a **different Google account** — keys from the same account share the same quota pool."
         )
     if "API_KEY_INVALID" in last_error or "403" in last_error:
         return (
@@ -2708,7 +2716,7 @@ for i, msg in enumerate(st.session_state.messages):
                 st.code(msg["content"], language=None)
 
 # ════════════════════════════════════════════════════════════════════
-# FILE UPLOAD — ChatGPT-style: paperclip toggle above input bar
+# FILE UPLOAD — True ChatGPT-style: attach file THEN type question
 # ════════════════════════════════════════════════════════════════════
 
 # Toolbar row: paperclip button (left-aligned, compact)
@@ -2720,7 +2728,6 @@ with col_attach:
         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",
@@ -2728,33 +2735,28 @@ if st.session_state.show_uploader:
         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="🧑‍🎓"):
-            st.markdown(f"📎 **Uploaded:** `{uploaded_file.name}`")
-
-        with st.chat_message("assistant", avatar="📐"):
-            with st.spinner("📖 Reading your file..."):
-                answer = handle_uploaded_file(uploaded_file, user_note)
-            st.markdown(answer)
-            with st.expander("📋 Copy"):
-                st.code(answer, language=None)
-
-        if not st.session_state.current_chat_id:
-            new_chat()
-        st.session_state.messages.append({
-            "role": "user",
-            "content": f"📎 Uploaded: `{uploaded_file.name}`"
-        })
-        st.session_state.messages.append({"role": "assistant", "content": answer})
-        save_current_chat()
+    if uploaded_file:
+        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
+            # Store file bytes in session state — wait for user's typed question
+            st.session_state.pending_file_bytes = uploaded_file.read()
+            st.session_state.pending_file_name  = uploaded_file.name
+            st.session_state.pending_file_mime  = uploaded_file.type or "application/octet-stream"
+            st.session_state.show_uploader = False
+            st.rerun()
+
+# Show attached file pill above input bar so user knows it's ready
+if st.session_state.pending_file_bytes is not None:
+    col_pill, col_x = st.columns([9, 1])
+    with col_pill:
+        st.info(f"📎 **{st.session_state.pending_file_name}** attached — type your question below and press Enter")
+    with col_x:
+        if st.button("✕", key="remove_pending", help="Remove attached file"):
+            st.session_state.pending_file_bytes = None
+            st.session_state.pending_file_name  = None
+            st.session_state.pending_file_mime  = None
+            st.rerun()
 
 # ════════════════════════════════════════════════════════════════════
 # INPUT — ChatGPT-style input bar
@@ -2781,6 +2783,40 @@ else:
 if problem and problem != st.session_state.last_submitted:
     st.session_state.last_submitted = problem
 
+    # ── If a file is attached, send file + question to Gemini Vision ─
+    if st.session_state.pending_file_bytes is not None:
+        import base64
+
+        file_bytes = st.session_state.pending_file_bytes
+        file_name  = st.session_state.pending_file_name
+        file_mime  = st.session_state.pending_file_mime
+
+        # Clear pending file immediately so it's not re-sent on rerun
+        st.session_state.pending_file_bytes = None
+        st.session_state.pending_file_name  = None
+        st.session_state.pending_file_mime  = None
+
+        with st.chat_message("user", avatar="🧑‍🎓"):
+            st.markdown(f"📎 **{file_name}** — {problem}")
+
+        with st.chat_message("assistant", avatar="📐"):
+            with st.spinner("📖 Reading your file with Gemini..."):
+                image_b64 = base64.b64encode(file_bytes).decode("utf-8")
+                answer = ask_gemini_vision(image_b64, file_mime, problem)
+            st.markdown(answer)
+            with st.expander("📋 Copy"):
+                st.code(answer, language=None)
+
+        if not st.session_state.current_chat_id:
+            new_chat()
+        st.session_state.messages.append({
+            "role": "user",
+            "content": f"📎 {file_name} — {problem}"
+        })
+        st.session_state.messages.append({"role": "assistant", "content": answer})
+        save_current_chat()
+        st.stop()
+
     # ── Detect casual / non-math messages ───────────────────────────
     p_lower = problem.lower().strip()
     casual_keywords = [