Update src/streamlit_app.py

src/streamlit_app.py

@@ -424,6 +424,91 @@ def show_login_page():
                     else:
                         st.error(f"❌ {result}")
 
+def upload_and_poll_files(api_key: str, uploaded_files: list):
+    """
+    Helper function to upload and poll multiple PDF files.
+    
+    Handles uploading via upload_pdf(), polling for processing status,
+    and displaying appropriate UI messages.
+    """
+    if not api_key:
+        st.error("Missing API key. Please login first.")
+        return
+    
+    progress_bar = st.progress(0)
+    status_text = st.empty()
+    
+    for i, file in enumerate(uploaded_files):
+        status_text.text(f"Uploading {file.name}...")
+        
+        result = upload_pdf(api_key, file)
+        
+        if not result["success"]:
+            st.error(f"❌ {file.name}: {result['error']}")
+            progress_bar.progress((i + 1) / len(uploaded_files))
+            continue
+        
+        data = result.get("data") or {}
+        job_id = data.get("document_id") or data.get("job_id")
+        status = data.get("status")
+        
+        if status == "processing" and job_id:
+            # Polling loop for processing status
+            poll_text = st.empty()
+            poll_progress = st.progress(0)
+            max_poll_seconds = 600
+            poll_interval = 2
+            elapsed = 0
+            while elapsed < max_poll_seconds:
+                try:
+                    resp = requests.get(
+                        f"{API_BASE_URL}/upload-status/{job_id}",
+                        headers=get_headers(api_key),
+                        timeout=10
+                    )
+                    
+                    if resp.status_code == 200:
+                        job = resp.json()
+                        final_status = job.get("status")
+                        display_name = job.get("username") or job.get("user_id")
+                        
+                        if final_status not in ["processing"]:
+                            if final_status in ["success", "completed"]:
+                                res = job.get("result", {})
+                                st.success(f"✅ {file.name} processed for {display_name}: {res.get('filename', file.name)}")
+                            else:
+                                error_msg = job.get('error', 'unknown error')
+                                st.error(f"❌ {file.name} failed for {display_name}: {error_msg}")
+                            break
+                        else:
+                            poll_text.text(f"Processing {file.name} for {display_name}... elapsed {elapsed}s")
+                    else:
+                        poll_text.text(f"Waiting for processing... (status {resp.status_code})")
+                        
+                except Exception as e:
+                    poll_text.text(f"Waiting... ({str(e)})")
+                
+                time.sleep(poll_interval)
+                elapsed += poll_interval
+                poll_progress.progress(min(1.0, elapsed / max_poll_seconds))
+            
+            if elapsed >= max_poll_seconds:
+                st.error(f"❌ {file.name}: Processing timed out after {max_poll_seconds}s")
+                
+        elif status in ["success", "completed"]:
+            st.success(f"✅ {file.name} uploaded and processed successfully")
+            
+        else:
+            # Unknown or missing status: assume success if data is present (backend stored it)
+            if data and (job_id or status):
+                st.success(f"✅ {file.name} uploaded successfully")
+            else:
+                st.info(f"ℹ️ {file.name}: Upload response unclear - assuming success")
+        
+        progress_bar.progress((i + 1) / len(uploaded_files))
+    
+    status_text.text("✅ Upload complete!")
+
 # ============================================
 # MAIN APPLICATION UI
 # ============================================
@@ -486,69 +571,7 @@ def show_main_app():
 
         if uploaded_files:
             if st.button("📤 Upload All", use_container_width=True, type="secondary"):
-                progress_bar = st.progress(0)
-                status_text = st.empty()
-                for i, file in enumerate(uploaded_files):
-                    status_text.text(f"Uploading {file.name}...")
-
-                    result = upload_pdf(st.session_state.api_key, file)
-
-                    if not result["success"]:
-                        st.error(f"❌ {file.name}: {result['error']}")
-                        progress_bar.progress((i + 1) / len(uploaded_files))
-                        continue
-
-                    data = result.get("data") or {}
-                    job_id = data.get("document_id") or data.get("job_id")
-                    status = data.get("status")
-
-                    if status == "processing" and job_id:
-                        poll_text = st.empty()
-                        poll_progress = st.progress(0)
-                        max_poll_seconds = 600
-                        poll_interval = 2
-                        elapsed = 0
-                        while elapsed < max_poll_seconds:
-                            try:
-                                resp = requests.get(
-                                    f"{API_BASE_URL}/upload-status/{job_id}",
-                                    headers=get_headers(st.session_state.api_key),
-                                    timeout=10
-                                )
-
-                                if resp.status_code == 200:
-                                    job = resp.json()
-                                    final_status = job.get("status")
-                                    display_name = job.get("username") or job.get("user_id")
-                                    if final_status != "processing":
-                                        if final_status == "success":
-                                            res = job.get("result", {})
-                                            st.success(f"✅ {file.name} processed for {display_name}: {res.get('filename', file.name)}")
-                                        else:
-                                            st.error(f"❌ {file.name} failed for {display_name}: {job.get('error', 'unknown error')}")
-                                        break
-                                    else:
-                                        poll_text.text(f"Processing {file.name} for {display_name}... elapsed {elapsed}s")
-                                else:
-                                    poll_text.text(f"Waiting for processing... (status {resp.status_code})")
-                            except Exception as e:
-                                poll_text.text(f"Waiting... ({str(e)})")
-
-                            time.sleep(poll_interval)
-                            elapsed += poll_interval
-                            poll_progress.progress(min(1.0, elapsed / max_poll_seconds))
-
-                        if elapsed >= max_poll_seconds:
-                            st.error(f"❌ {file.name}: Processing timed out after {max_poll_seconds}s")
-
-                    elif status == "success":
-                        st.success(f"✅ {file.name} uploaded and processed successfully")
-                    else:
-                        st.info(f"ℹ️ {file.name}: {data}")
-
-                    progress_bar.progress((i + 1) / len(uploaded_files))
-
-                status_text.text("✅ Upload complete!")
+                upload_and_poll_files(st.session_state.api_key, uploaded_files)
 
         # Chat interface
         # Provide a scope selector: General (all docs) or a specific uploaded document