update

dashboard.py

@@ -6,9 +6,9 @@ Full OAuth login + integrated pipeline (no subprocess)
 import streamlit as st
 import json
 import os
-import tempfile
 import pandas as pd
 import plotly.graph_objects as go
+from youtube_auth import get_credentials, show_login_button, logout
 
 # ── Page Config ──
 st.set_page_config(
@@ -66,16 +66,19 @@ st.markdown("""
 </style>
 """, unsafe_allow_html=True)
 
+# ── Handle post-login rerun FIRST (before anything else) ──
+if "just_logged_in" in st.session_state:
+    del st.session_state["just_logged_in"]
+    st.rerun()
 
 # ── Helpers ──
-
 def get_spot_quality(retention):
     if retention >= 50:
-        return "🟢", "Great Spot",   "placement-card",      "badge-green"
+        return "🟢", "Great Spot",  "placement-card",      "badge-green"
     elif retention >= 30:
-        return "🟡", "Decent Spot",  "placement-card-warn", "badge-yellow"
+        return "🟡", "Decent Spot", "placement-card-warn", "badge-yellow"
     else:
-        return "🔴", "Weak Spot",    "placement-card-bad",  "badge-red"
+        return "🔴", "Weak Spot",   "placement-card-bad",  "badge-red"
 
 def get_type_label(t):
     return {
@@ -107,40 +110,36 @@ def load_json(path):
     with open(path) as f:
         return json.load(f)
 
-
 # ══════════════════════════════════════════════
 #  HEADER
 # ══════════════════════════════════════════════
 st.markdown('<div class="big-title">🎯 Ad Placement Recommender</div>', unsafe_allow_html=True)
 st.markdown('<div class="subtitle">Find the perfect moments in your video to place ads — so viewers stay happy and you earn more.</div>', unsafe_allow_html=True)
 
-
 # ══════════════════════════════════════════════
 #  AUTH GATE
 # ══════════════════════════════════════════════
-from youtube_auth import get_credentials, show_login_button, logout
-
 creds = get_credentials()
 
 if creds is None:
     st.markdown("---")
-    st.markdown("""
-    <div class="login-card">
-        <div style="font-size:3rem;">🔐</div>
-        <div style="font-size:1.3rem; font-weight:700; color:#fff; margin:1rem 0;">
-            Connect Your YouTube Account
-        </div>
-        <div style="color:#9ca3af; font-size:0.9rem; margin-bottom:1.5rem;">
-            We need read-only access to your YouTube Analytics<br>
-            to see where viewers drop off in your videos.<br><br>
-            <b style="color:#6ee7b7;">We never post, modify or delete anything.</b>
-        </div>
-    </div>
-    """, unsafe_allow_html=True)
-
-    auth_url = show_login_button()
     col1, col2, col3 = st.columns([1, 2, 1])
     with col2:
+        st.markdown("""
+        <div class="login-card">
+            <div style="font-size:3rem;">🔐</div>
+            <div style="font-size:1.3rem;font-weight:700;color:#fff;margin:1rem 0;">
+                Connect Your YouTube Account
+            </div>
+            <div style="color:#9ca3af;font-size:0.9rem;margin-bottom:1.5rem;">
+                We need read-only access to your YouTube Analytics<br>
+                to see where viewers drop off in your videos.<br><br>
+                <b style="color:#6ee7b7;">We never post, modify or delete anything.</b>
+            </div>
+        </div>
+        """, unsafe_allow_html=True)
+
+        auth_url = show_login_button()
         st.markdown(f"""
         <a href="{auth_url}" target="_self" style="text-decoration:none;">
             <div style="
@@ -155,7 +154,7 @@ if creds is None:
         """, unsafe_allow_html=True)
     st.stop()
 
-# ── Logged in — show logout in sidebar ──
+# ── Sidebar (logged in) ──
 with st.sidebar:
     st.markdown("### 👤 Account")
     st.success("✅ YouTube Connected")
@@ -171,7 +170,6 @@ with st.sidebar:
     4. 📍 See exactly where to place ads
     """)
 
-
 # ══════════════════════════════════════════════
 #  INPUT FORM
 # ══════════════════════════════════════════════
@@ -201,13 +199,11 @@ if analyze_btn:
         if not video_id:
             st.error("❌ Could not extract video ID. Please check your YouTube URL.")
         else:
-            # Save uploaded video to temp file
             os.makedirs("test_video", exist_ok=True)
             save_path = os.path.join("test_video", uploaded_file.name)
             with open(save_path, "wb") as f:
                 f.write(uploaded_file.getbuffer())
 
-            # Run pipeline with live progress
             from pipeline import run_full_pipeline
 
             progress_box = st.empty()
@@ -231,7 +227,6 @@ if analyze_btn:
 
 st.markdown("---")
 
-
 # ══════════════════════════════════════════════
 #  LOAD RESULTS
 # ══════════════════════════════════════════════
@@ -249,18 +244,16 @@ total_placed = data.get("total_placements_recommended", 0)
 cands_list   = candidates.get("ranked_placements", []) if candidates else []
 top_ret      = max((c["retention_at_t"] for c in cands_list), default=0)
 
-
 # ══════════════════════════════════════════════
 #  METRICS
 # ══════════════════════════════════════════════
 m1, m2, m3, m4 = st.columns(4)
-metrics = [
-    ("🎬 Video Duration",         duration,           "#ffffff"),
-    ("📍 Best Ad Spots Found",    total_placed,       "#22c55e" if total_placed > 0 else "#ef4444"),
-    ("🔬 Moments Analyzed",       len(cands_list),    "#ffffff"),
-    ("👀 Best Spot Retention",    f"{top_ret:.0f}%",  "#22c55e" if top_ret >= 50 else "#f59e0b"),
-]
-for col, (label, value, color) in zip([m1, m2, m3, m4], metrics):
+for col, label, value, color in [
+    (m1, "🎬 Video Duration",      duration,           "#ffffff"),
+    (m2, "📍 Best Ad Spots Found", total_placed,       "#22c55e" if total_placed > 0 else "#ef4444"),
+    (m3, "🔬 Moments Analyzed",    len(cands_list),    "#ffffff"),
+    (m4, "👀 Best Spot Retention", f"{top_ret:.0f}%",  "#22c55e" if top_ret >= 50 else "#f59e0b"),
+]:
     with col:
         st.markdown(f"""
         <div class="metric-box">
@@ -270,15 +263,14 @@ for col, (label, value, color) in zip([m1, m2, m3, m4], metrics):
 
 st.markdown("<br>", unsafe_allow_html=True)
 
-
 # ══════════════════════════════════════════════
 #  RETENTION CURVE
 # ══════════════════════════════════════════════
 st.markdown('<div class="section-header">📈 Your Viewer Retention Curve</div>', unsafe_allow_html=True)
-st.caption("This shows how many viewers are still watching at each moment. The markers show your recommended ad spots.")
+st.caption("This shows how many viewers are still watching at each moment. Markers show recommended ad spots.")
 
 if retention:
-    times  = [p["time_seconds"]     for p in retention]
+    times  = [p["time_seconds"]      for p in retention]
     values = [p["retention_percent"] for p in retention]
 
     fig = go.Figure()
@@ -310,7 +302,6 @@ if retention:
 
 st.markdown("---")
 
-
 # ══════════════════════════════════════════════
 #  RECOMMENDATIONS
 # ══════════════════════════════════════════════
@@ -369,7 +360,6 @@ else:
 
 st.markdown("---")
 
-
 # ══════════════════════════════════════════════
 #  INSIGHTS FOR NEXT VIDEO
 # ══════════════════════════════════════════════
@@ -384,8 +374,8 @@ if cands_list:
 
     i1, i2, i3 = st.columns(3)
     for col, label, value, color, sub in [
-        (i1, "🏆 Peak Retention Spot",    f"{best_ret:.0f}%",  "#22c55e", "viewers at best moment"),
-        (i2, "📉 Biggest Drop-Off At",    drop_time,           "#ef4444", "most viewers left here"),
+        (i1, "🏆 Peak Retention Spot",     f"{best_ret:.0f}%", "#22c55e", "viewers at best moment"),
+        (i2, "📉 Biggest Drop-Off At",     drop_time,          "#ef4444", "most viewers left here"),
         (i3, "📊 Avg Retention at Breaks", f"{avg_ret:.0f}%",  "#f59e0b", "across all detected moments"),
     ]:
         with col:
@@ -403,18 +393,17 @@ if cands_list:
     if best_ret >= 60:
         tips.append("✅ **Strong early retention** — your intro hooks viewers well. Keep doing what you did in the first 2 minutes.")
     if worst_ret < 25:
-        tips.append(f"⚠️ **Viewers drop off near {drop_time}** — tighten that section or add a re-engagement hook (a question, teaser, or visual change).")
+        tips.append(f"⚠️ **Viewers drop off near {drop_time}** — tighten that section or add a re-engagement hook.")
     if avg_ret < 35:
-        tips.append("📉 **Overall retention is low** — try shorter videos or stronger pacing to keep viewers engaged longer.")
+        tips.append("📉 **Overall retention is low** — try shorter videos or stronger pacing.")
     if avg_ret >= 50:
-        tips.append("🎉 **Great overall retention** — your audience is engaged. You can confidently place ads and expect good visibility.")
+        tips.append("🎉 **Great overall retention** — you can confidently place ads and expect good visibility.")
     if total_placed == 0:
         tips.append("🔴 **No strong ad spots this time** — aim to keep 40%+ viewers watching past the 2-minute mark.")
 
     for tip in tips:
         st.markdown(f"- {tip}")
 
-
 # ══════════════════════════════════════════════
 #  ADVANCED TABLE
 # ══════════════════════════════════════════════
@@ -428,7 +417,6 @@ with st.expander("🔬 View All Analyzed Moments (Advanced)"):
         df_show["ML Score"]             = df_show["ML Score"].map(lambda x: f"{x:.4f}")
         st.dataframe(df_show, use_container_width=True, hide_index=True)
 
-
 # ── Footer ──
 st.markdown("<br>", unsafe_allow_html=True)
 st.markdown(

youtube_auth.py

@@ -39,28 +39,36 @@ def build_flow():
     return flow
 
 def get_credentials():
+    # Already authenticated this session
     if "google_creds" in st.session_state:
-        creds = Credentials.from_authorized_user_info(
-            st.session_state["google_creds"], SCOPES
-        )
-        if creds.valid:
-            return creds
-        if creds.expired and creds.refresh_token:
-            creds.refresh(Request())
-            st.session_state["google_creds"] = json.loads(creds.to_json())
-            return creds
+        try:
+            creds = Credentials.from_authorized_user_info(
+                st.session_state["google_creds"], SCOPES
+            )
+            if creds.valid:
+                return creds
+            if creds.expired and creds.refresh_token:
+                creds.refresh(Request())
+                st.session_state["google_creds"] = json.loads(creds.to_json())
+                return creds
+        except Exception:
+            del st.session_state["google_creds"]
 
-    params = st.query_params
+    # Check for OAuth callback code in URL
+    params = dict(st.query_params)
     if "code" in params:
         try:
             flow = build_flow()
             flow.fetch_token(code=params["code"])
             creds = flow.credentials
+            # Save BEFORE clearing params
             st.session_state["google_creds"] = json.loads(creds.to_json())
+            st.session_state["just_logged_in"] = True
             st.query_params.clear()
             return creds
         except Exception as e:
-            st.error(f"Login failed: {e}")
+            st.error(f"Login failed: {e}. Please try again.")
+            st.query_params.clear()
             return None
 
     return None
@@ -74,7 +82,6 @@ def show_login_button():
     return auth_url
 
 def logout():
-    if "google_creds" in st.session_state:
-        del st.session_state["google_creds"]
-    if "user_info" in st.session_state:
-        del st.session_state["user_info"]
+    for key in ["google_creds", "just_logged_in", "user_info"]:
+        if key in st.session_state:
+            del st.session_state[key]