Update src/streamlit_app.py

src/streamlit_app.py

@@ -32,7 +32,7 @@ if not GOOGLE_API_KEY:
     st.stop()
 
 genai.configure(api_key=GOOGLE_API_KEY)
-model = genai.GenerativeModel('gemini-2.5-pro')
+model = genai.GenerativeModel('gemini-1.5-pro')
 
 # -----------------------------------------------------------------------------
 # 1. DATABASE SYSTEM
@@ -84,8 +84,8 @@ init_db()
 if 'page' not in st.session_state: st.session_state.page = 'landing'
 if 'logged_in' not in st.session_state: st.session_state.logged_in = False
 if 'user_email' not in st.session_state: st.session_state.user_email = ""
-if 'analysis_result' not in st.session_state: st.session_state.analysis_result = None # Stores the text result
-if 'analysis_images' not in st.session_state: st.session_state.analysis_images = [] # Stores images
+if 'analysis_result' not in st.session_state: st.session_state.analysis_result = None
+if 'analysis_images' not in st.session_state: st.session_state.analysis_images = []
 if 'chat_history' not in st.session_state: st.session_state.chat_history = []
 
 st.markdown("""
@@ -98,26 +98,21 @@ st.markdown("""
     .risk-fill-low { background: #22c55e; width: 33%; height: 100%; border-radius: 5px; }
     .risk-fill-med { background: #eab308; width: 66%; height: 100%; border-radius: 5px; }
     .risk-fill-high { background: #ef4444; width: 100%; height: 100%; border-radius: 5px; }
-    
-    /* Chat Bubbles */
     .chat-user { background: #27272a; padding: 10px; border-radius: 10px; margin-bottom: 5px; text-align: right; color: #e4e4e7; }
     .chat-ai { background: #1e3a8a; padding: 10px; border-radius: 10px; margin-bottom: 5px; text-align: left; color: white; }
-    
     #MainMenu, footer, header {visibility: hidden;}
 </style>
 """, unsafe_allow_html=True)
 
 # -----------------------------------------------------------------------------
-# 3. CORE LOGIC
+# 3. LOGIC
 # -----------------------------------------------------------------------------
 def get_gemini_analysis(images, text_context, mode):
-    # 1. Mode Selection
     role = "a helpful medical assistant"
     if mode == "Radiologist Expert": role = "a senior radiologist. Use precise technical terminology."
     elif mode == "Simple Explanation": role = "a compassionate doctor explaining to a patient. Use simple analogies."
     elif mode == "Medical Student": role = "a medical professor teaching a student. Explain the 'why'."
     
-    # 2. Prompt
     prompt = [
         f"You are SHINUI, {role}.",
         f"Analyze these medical images and this clinical context: '{text_context}'.",
@@ -128,10 +123,7 @@ def get_gemini_analysis(images, text_context, mode):
         "Part 4: Recommended Actions",
         "Do not use Markdown headers. Just raw text for each section."
     ]
-    
-    # 3. Build Content List (Text + Images)
     content = prompt + images
-    
     try:
         response = model.generate_content(content)
         return response.text
@@ -139,35 +131,31 @@ def get_gemini_analysis(images, text_context, mode):
         return f"Error|||System Error|||Low|||{str(e)}"
 
 def chat_with_scan(user_query):
-    # We provide the PREVIOUS ANALYSIS as context so it doesn't have to re-analyze everything from scratch
-    # Ideally we pass images again if the API supports stateful chat, but for single-turn REST API:
-    # We will pass the images + previous findings + user query.
-    
     prev_findings = st.session_state.analysis_result
     images = st.session_state.analysis_images
-    
     context_prompt = [
         "You are SHINUI. We have already analyzed the patient's scan. Here are the previous findings:",
         f"--- START FINDINGS ---\n{prev_findings}\n--- END FINDINGS ---",
         "The user has a follow-up question based on these findings. Answer directly and clearly.",
         f"User Question: {user_query}"
     ]
-    
-    # Combine images into the prompt again to ensure it can "look" at specific areas if asked
     full_content = context_prompt + images
-    
     try:
         response = model.generate_content(full_content)
         return response.text
     except: return "I could not process that follow-up. Please try rephrasing."
 
-def set_page(p): st.session_state.page = p; st.rerun()
-def sign_out(): 
+# Navigation Helper (NO CALLBACKS)
+def go_to(page):
+    st.session_state.page = page
+    st.rerun()
+
+def do_sign_out():
     st.session_state.logged_in=False
     st.session_state.analysis_result=None
     st.session_state.analysis_images=[]
     st.session_state.chat_history=[]
-    set_page('landing')
+    go_to('landing')
 
 # -----------------------------------------------------------------------------
 # 4. PAGES
@@ -178,16 +166,18 @@ def show_landing():
     c1, c2 = st.columns([1, 6])
     with c1: st.markdown("<h3 style='color:#3b82f6'>SHINUI</h3>", unsafe_allow_html=True)
     st.markdown("<br><br>", unsafe_allow_html=True)
-    
     col1, col2 = st.columns([1.2, 1])
     with col1:
         st.markdown("<h1 style='font-size: 3.5rem'>Medical Intelligence<br><span style='color:#3b82f6'>Redefined.</span></h1>", unsafe_allow_html=True)
         st.markdown("<p style='color:#a1a1aa; font-size:1.1rem'>Multi-image analysis, expert modes, and realtime AI chat.</p>", unsafe_allow_html=True)
         b1, b2 = st.columns([1,1])
+        
+        # FIXED: Normal buttons, no on_click callback
         with b1: 
-            if st.button("Launch App"): set_page('login')
+            if st.button("Launch App"): go_to('login')
         with b2: 
-            if st.button("About"): set_page('about')
+            if st.button("About"): go_to('about')
+            
     with col2:
         st.markdown("<div class='meta-card' style='height:300px; display:flex; justify-content:center; align-items:center;'><h1>🧬</h1></div>", unsafe_allow_html=True)
 
@@ -204,7 +194,7 @@ def show_auth():
                 if login_user(email, pw):
                     st.session_state.logged_in=True
                     st.session_state.user_email=email
-                    set_page('dashboard')
+                    go_to('dashboard')
                 else: st.error("Invalid")
         with tab2:
             re = st.text_input("Email", key="r_e")
@@ -216,148 +206,94 @@ def show_auth():
 
 # --- DASHBOARD ---
 def show_dashboard():
-    # SIDEBAR
     total_scans, last_scan = get_user_stats(st.session_state.user_email)
-    
     with st.sidebar:
         st.markdown(f"### 👤 {st.session_state.user_email}")
         st.markdown("<div style='color:#10b981; margin-bottom:10px'>● Online</div>", unsafe_allow_html=True)
-        
-        # Personal Dashboard Stats
         st.markdown("---")
         c1, c2 = st.columns(2)
         c1.metric("Total Scans", total_scans)
         c2.metric("Last Active", last_scan if last_scan != "N/A" else "New")
-        
         st.markdown("---")
         if st.button("Start New Analysis"):
             st.session_state.analysis_result = None
             st.session_state.analysis_images = []
             st.session_state.chat_history = []
             st.rerun()
-        if st.button("Sign Out"): sign_out()
+        if st.button("Sign Out"): do_sign_out()
 
-    # MAIN UI
     st.title("Advanced Diagnostic Interface")
-    
-    # INPUT SECTION (If no result yet)
     if st.session_state.analysis_result is None:
         st.markdown("<div class='meta-card'>", unsafe_allow_html=True)
-        
-        # 1. Multi-Image
         img_files = st.file_uploader("Upload Medical Scans (X-Ray, MRI, CT)", type=['png','jpg','jpeg'], accept_multiple_files=True)
-        
-        # 2. Context & Mode
         c1, c2 = st.columns([2, 1])
-        with c1:
-            txt_context = st.text_area("Patient Symptoms / Clinical Context", height=100, placeholder="E.g. Patient has chest pain for 3 weeks...")
-        with c2:
-            mode = st.selectbox("Analysis Mode", ["Radiologist Expert", "Simple Explanation", "Medical Student", "Research Deep Dive"])
-        
+        with c1: txt_context = st.text_area("Patient Symptoms / Clinical Context", height=100, placeholder="E.g. Patient has chest pain for 3 weeks...")
+        with c2: mode = st.selectbox("Analysis Mode", ["Radiologist Expert", "Simple Explanation", "Medical Student", "Research Deep Dive"])
         if st.button("Run SHINUI Analysis"):
-            if not img_files and not txt_context:
-                st.error("Please upload an image or provide text.")
+            if not img_files and not txt_context: st.error("Please upload an image or provide text.")
             else:
                 with st.spinner("Processing Multi-Modal Data..."):
                     pil_images = [Image.open(x) for x in img_files] if img_files else []
-                    
-                    # Call AI
                     res = get_gemini_analysis(pil_images, txt_context, mode)
-                    
-                    # Store State
                     st.session_state.analysis_result = res
                     st.session_state.analysis_images = pil_images
-                    
-                    # Parse Risk for DB
                     parts = res.split("|||")
                     risk_lvl = parts[2].strip() if len(parts) > 2 else "Unknown"
                     add_history(st.session_state.user_email, "Multi-Scan", res, risk_lvl)
                     st.rerun()
         st.markdown("</div>", unsafe_allow_html=True)
-
-    # RESULT SECTION (If result exists)
     else:
         res = st.session_state.analysis_result
         images = st.session_state.analysis_images
-        
-        # 1. Action Bar
         col_act1, col_act2 = st.columns([1, 4])
+        
+        # FIXED: Normal button logic
         with col_act1:
-            if st.button("💬 Chat with Scan"):
-                set_page('chat')
+            if st.button("💬 Chat with Scan"): go_to('chat')
         
         st.markdown("---")
-
-        # 2. Parse Output
         parts = res.split("|||")
         if len(parts) >= 4:
             obs, risks, severity, actions = parts[0], parts[1], parts[2], parts[3]
-            
-            # SEVERITY BAR
             sev_clean = severity.strip().lower()
             bar_class = "risk-fill-low"
             color = "#22c55e"
             if "medium" in sev_clean: bar_class = "risk-fill-med"; color = "#eab308"
             if "high" in sev_clean: bar_class = "risk-fill-high"; color = "#ef4444"
-            
-            st.markdown(f"""
-            <div class='meta-card'>
-                <h4 style='margin:0; color:{color}'>SEVERITY SCORE: {severity.upper()}</h4>
-                <div class='risk-bar'><div class='{bar_class}'></div></div>
-            </div>
-            """, unsafe_allow_html=True)
-            
+            st.markdown(f"<div class='meta-card'><h4 style='margin:0; color:{color}'>SEVERITY SCORE: {severity.upper()}</h4><div class='risk-bar'><div class='{bar_class}'></div></div></div>", unsafe_allow_html=True)
             c1, c2 = st.columns(2)
             with c1:
                 st.markdown(f"<div class='meta-card'><h4 style='color:#3b82f6'>🔍 Findings</h4>{obs}</div>", unsafe_allow_html=True)
                 st.markdown(f"<div class='meta-card'><h4 style='color:#f59e0b'>⚠️ Risks</h4>{risks}</div>", unsafe_allow_html=True)
             with c2:
                 st.markdown(f"<div class='meta-card'><h4 style='color:#10b981'>✅ Protocol</h4>{actions}</div>", unsafe_allow_html=True)
-                if images:
-                    # Use use_container_width instead of use_column_width to fix warning
-                    st.image(images[0], caption="Primary Scan Reference", use_container_width=True)
+                if images: st.image(images[0], caption="Primary Scan Reference", use_container_width=True)
 
-# --- CHAT PAGE (Separate Page) ---
+# --- CHAT PAGE ---
 def show_chat():
-    st.button("← Back to Results", on_click=lambda: set_page('dashboard'))
-    
+    # FIXED: Normal button logic
+    if st.button("← Back to Results"): go_to('dashboard')
     st.title("💬 Chat with Scan")
-    
-    # Display Images Context (Small)
     if st.session_state.analysis_images:
         with st.expander("View Scans Reference"):
-            # Show images in a row
             cols = st.columns(len(st.session_state.analysis_images))
             for idx, img in enumerate(st.session_state.analysis_images):
-                with cols[idx]:
-                    st.image(img, width=150)
-
-    # Chat Container
+                with cols[idx]: st.image(img, width=150)
     chat_container = st.container()
-    
-    # Input at bottom
     user_input = st.chat_input("Ask a follow-up question about the findings...")
-    
     if user_input:
-        # 1. Add User Message
         st.session_state.chat_history.append({"role": "user", "content": user_input})
-        
-        # 2. Generate Response (Context Aware)
         with st.spinner("Consulting Analysis..."):
             ai_reply = chat_with_scan(user_input)
             st.session_state.chat_history.append({"role": "ai", "content": ai_reply})
-            
-    # Render Chat History
     with chat_container:
         for msg in st.session_state.chat_history:
-            if msg['role'] == 'user':
-                st.markdown(f"<div class='chat-user'>{msg['content']}</div>", unsafe_allow_html=True)
-            else:
-                st.markdown(f"<div class='chat-ai'>{msg['content']}</div>", unsafe_allow_html=True)
+            if msg['role'] == 'user': st.markdown(f"<div class='chat-user'>{msg['content']}</div>", unsafe_allow_html=True)
+            else: st.markdown(f"<div class='chat-ai'>{msg['content']}</div>", unsafe_allow_html=True)
 
 # --- ABOUT ---
 def show_about():
-    if st.button("← Back"): set_page('landing')
+    if st.button("← Back"): go_to('landing')
     st.markdown("<br><div class='meta-card'><h2>About SHINUI</h2><p>Advanced Medical AI.</p></div>", unsafe_allow_html=True)
 
 # -----------------------------------------------------------------------------
@@ -367,8 +303,8 @@ if st.session_state.page == 'landing': show_landing()
 elif st.session_state.page == 'login': show_auth()
 elif st.session_state.page == 'dashboard': 
     if st.session_state.logged_in: show_dashboard()
-    else: set_page('login')
+    else: go_to('login')
 elif st.session_state.page == 'chat':
     if st.session_state.logged_in: show_chat()
-    else: set_page('login')
+    else: go_to('login')
 elif st.session_state.page == 'about': show_about()