Update app.py

app.py

@@ -10,6 +10,7 @@ import plotly.graph_objects as go
 import streamlit as st
 from pymongo import MongoClient
 from urllib.parse import quote_plus
+
 st.set_page_config(page_title="Student Skill Radar", layout="wide")
 
 # ------------------- Constants -------------------
@@ -123,31 +124,44 @@ def plot_radar(df: pd.DataFrame, grouped: bool, title: str):
     return fig
 
 
-# ------------------- Mongo Access -------------------
-@st.cache_data(show_spinner=False)
-def _client(uri: str):
-    return MongoClient(uri, serverSelectionTimeoutMS=10000)
-
+# ------------------- Mongo Access (secrets-only) -------------------
+def _get_secret(name: str) -> str | None:
+    # Prefer Streamlit secrets, fallback to env vars
+    try:
+        val = st.secrets.get(name)
+        if val is not None:
+            return str(val)
+    except Exception:
+        pass
+    return os.getenv(name)
+
+
+def _build_uri(db_name: str | None) -> str | None:
+    user = _get_secret("MONGO_USER")
+    pw = _get_secret("MONGO_PASS")
+    cluster = _get_secret("MONGO_CLUSTER")
+    if not (user and pw and cluster):
+        return None
+    user_q = quote_plus(user)
+    pw_q = quote_plus(pw)
+    db_path = f"/{db_name}" if db_name else ""
+    # TLS flags help on some hosts; SRV requires dnspython (present on Streamlit Cloud)
+    return (
+        f"mongodb+srv://{user_q}:{pw_q}@{cluster}{db_path}"
+        f"?retryWrites=true&w=majority&tls=true&tlsAllowInvalidCertificates=true"
+    )
 
-def get_mongo_uri(db_name: str | None = None) -> str | None:
-    user = os.getenv("MONGO_USER")
-    pw = os.getenv("MONGO_PASS")
-    cluster = os.getenv("MONGO_CLUSTER")
-    if user and pw and cluster:
-        user_q = quote_plus(user)
-        pw_q = quote_plus(pw)
-        db_path = f"/{db_name}" if db_name else ""
-        # TLS flags help on Spaces; SRV requires dnspython
-        return (
-            f"mongodb+srv://{user_q}:{pw_q}@{cluster}{db_path}"
-            f"?retryWrites=true&w=majority&tls=true&tlsAllowInvalidCertificates=true"
-        )
-    return None
 
+@st.cache_resource(show_spinner=False)
+def _client(uri: str):
+    # Use a cached client resource (not cache_data) for connections
+    return MongoClient(uri, serverSelectionTimeoutMS=10000)
 
 
 @st.cache_data(show_spinner=False)
 def mongo_distinct(uri: str, db: str, coll: str, field: str) -> List[str]:
+    if not uri:
+        return []
     try:
         c = _client(uri)
         vals = c[db][coll].distinct(field)
@@ -157,7 +171,17 @@ def mongo_distinct(uri: str, db: str, coll: str, field: str) -> List[str]:
 
 
 @st.cache_data(show_spinner=False)
-def mongo_records(uri: str, db: str, coll: str, student: str | None, source: str | None, start: str | None, end: str | None) -> List[dict]:
+def mongo_records(
+    uri: str,
+    db: str,
+    coll: str,
+    student: str | None,
+    source: str | None,
+    start: str | None,
+    end: str | None,
+) -> List[dict]:
+    if not uri:
+        return []
     q = {}
     if student and student != "(All)":
         q["student"] = student
@@ -183,19 +207,24 @@ def mongo_records(uri: str, db: str, coll: str, student: str | None, source: str
 
 
 # ------------------- UI -------------------
-st.title("📊 Student Skill Radar — MongoDB only")
+st.title("📊 Student Skill Radar — MongoDB (secrets-based)")
 
 with st.sidebar:
     st.subheader("MongoDB Settings")
     db_name = st.text_input("Database name", value="student_skills")
     coll_name = st.text_input("Collection name", value="responses_IFE_2025")
 
-    # URI handling
-    detected_uri = get_mongo_uri(db_name)
-    uri_override = st.text_input("Override MONGO_URI (optional)", type="password")
-    mongo_uri = uri_override.strip() or (detected_uri or "")
+    # Build from MONGO_USER / MONGO_PASS / MONGO_CLUSTER only
+    mongo_uri = _build_uri(db_name)
+
     if not mongo_uri:
-        st.warning("No Mongo URI found. Set MONGO_URI (or MONGO_USER/PASS/CLUSTER) in Space secrets, or paste an override.")
+        st.warning("Missing MONGO_USER, MONGO_PASS, or MONGO_CLUSTER in secrets/env.")
+    else:
+        try:
+            _client(mongo_uri).admin.command("ping")
+            st.success("Connected via secrets ✅")
+        except Exception as e:
+            st.error(f"Mongo connection failed: {e}")
 
     # Filters
     students = ["(All)"] + (mongo_distinct(mongo_uri, db_name, coll_name, "student") if mongo_uri else [])
@@ -218,7 +247,6 @@ end_str = end_dt.strftime("%Y-%m-%d") if isinstance(end_dt, date) else None
 
 # Fetch + aggregate
 records = mongo_records(mongo_uri, db_name, coll_name, student_choice, source_choice, start_str, end_str) if mongo_uri else []
-
 df = summarize(records, level=agg_level) if records else pd.DataFrame()
 
 # ------------------- Output -------------------
@@ -237,6 +265,7 @@ with right:
         csv = df.to_csv(index=False).encode("utf-8")
         st.download_button("Download CSV", data=csv, file_name="skill_scores.csv", mime="text/csv")
 
+
 # # app.py
 # import os
 # import json