Update app.py

app.py

@@ -1,18 +1,33 @@
-# app.py - WORKING VERSION WITH ERROR HANDLING
+# app.py - USING INDIVIDUAL SECRETS
 import streamlit as st
 import os
 import sys
 
-# Debug: Force print to see what's happening
-print("=== STARTING APP ===", file=sys.stderr)
-print(f"Current directory: {os.getcwd()}", file=sys.stderr)
-print(f"Files: {os.listdir('.')}", file=sys.stderr)
+# Debug info
+print("=== APP START ===", file=sys.stderr)
+print(f"All env vars: {list(os.environ.keys())}", file=sys.stderr)
 
-# Check for .streamlit folder
-if os.path.exists('.streamlit'):
-    print(f".streamlit contents: {os.listdir('.streamlit')}", file=sys.stderr)
+def get_secret(key, default=""):
+    """Get secret from environment or Streamlit secrets"""
+    # Try environment first (HuggingFace individual secrets)
+    env_value = os.getenv(key)
+    if env_value:
+        return env_value
+    
+    # Try Streamlit secrets as fallback
+    try:
+        # For nested keys like google.client_id
+        if '.' in key:
+            parts = key.split('.')
+            value = st.secrets
+            for part in parts:
+                value = value[part]
+            return value
+        else:
+            return st.secrets[key]
+    except:
+        return default
 
-# Simple app that works even without secrets
 def main():
     st.set_page_config(
         page_title="Social Media Data Extractor",
@@ -20,97 +35,96 @@ def main():
         layout="wide"
     )
     
-    # Try to load secrets
-    try:
-        # This will fail if secrets aren't loaded
-        test = st.secrets
-        print(f"Secrets loaded: {list(test.keys())}", file=sys.stderr)
-        secrets_loaded = True
-    except:
-        print("Secrets NOT loaded", file=sys.stderr)
-        secrets_loaded = False
+    # Get all secrets
+    client_id = get_secret("GOOGLE_CLIENT_ID")
+    client_secret = get_secret("GOOGLE_CLIENT_SECRET")
+    session_key = get_secret("SESSION_SECRET_KEY")
+    hf_token = get_secret("HUGGINGFACE_TOKEN")
+    admin_email = get_secret("ADMIN_EMAIL")
     
-    # Header
-    st.title("🔐 Social Media Data Extractor")
-    st.markdown("---")
+    # Debug display (safe)
+    st.sidebar.write("### 🔧 Debug Info")
+    st.sidebar.write(f"Client ID loaded: {'✅' if client_id else '❌'}")
+    st.sidebar.write(f"Session key: {'✅' if session_key else '❌'}")
     
-    if not secrets_loaded:
+    # Check if essential secrets are loaded
+    if not client_id or client_id == "your-client-id.apps.googleusercontent.com":
         st.error("""
-        ⚠️ **Configuration Error - Secrets Not Loaded**
-        
-        **Please check:**
-        
-        1. **HuggingFace Secrets** are configured in Space Settings
-        2. Secret name is exactly: `STREAMLIT_SECRETS_TOML`
-        3. The secret contains valid TOML format
-        
-        **To fix this:**
-        
-        1. Go to your Space: https://huggingface.co/spaces/Refat81/Social_Media_Data_Extractor_Chatbot/settings
-        2. Click "Repository secrets"
-        3. Add a secret named: `STREAMLIT_SECRETS_TOML`
-        4. Paste this (with your actual values):
+        ⚠️ **Google OAuth Not Configured**
         
-        ```toml
-        [google]
-        client_id = "your-client-id.apps.googleusercontent.com"
-        client_secret = "your-client-secret"
+        **Please add these secrets to HuggingFace:**
         
-        [session]
-        secret_key = "LXr9Q2v8bPp1Yt6zMk5w7x0aS3dFg4hJ7n8cV2bN5m8q9T1y3U6i0o"
+        1. Go to Space Settings → Repository Secrets
+        2. Add these individual secrets:
         
-        [api_keys]
-        huggingface_token = "your-hf-token"
-        ```
+        | Secret Name | Value |
+        |-------------|-------|
+        | `GOOGLE_CLIENT_ID` | Your Google Client ID |
+        | `GOOGLE_CLIENT_SECRET` | Your Google Client Secret |
+        | `SESSION_SECRET_KEY` | `LXr9Q2v8bPp1Yt6zMk5w7x0aS3dFg4hJ7n8cV2bN5m8q9T1y3U6i0o` |
+        | `HUGGINGFACE_TOKEN` | Your HuggingFace token |
         
-        5. Click "Save"
-        6. Restart the Space
+        3. Click "Save"
+        4. Restart the Space
         """)
         return
     
-    # If secrets are loaded, check if Google OAuth is configured
-    try:
-        client_id = st.secrets["google"]["client_id"]
-        if client_id == "placeholder-client-id":
-            st.warning("⚠️ Using placeholder credentials. Please add real Google OAuth credentials.")
-            return
-    except:
-        st.error("Google OAuth not configured in secrets")
-        return
-    
-    # Show login button
+    # Show login page
+    st.title("🔐 Social Media Data Extractor")
+    st.markdown("---")
     st.markdown("### Welcome! Please login to continue")
     
     # Create login URL
     redirect_uri = "https://refat81-social-media-data-extractor-chatbot.hf.space/oauth_callback"
     login_url = f"https://accounts.google.com/o/oauth2/v2/auth?client_id={client_id}&redirect_uri={redirect_uri}&response_type=code&scope=openid%20email%20profile&access_type=offline&prompt=consent"
     
+    # Google login button
     st.markdown(f"""
-    <a href="{login_url}" target="_self">
+    <a href="{login_url}">
         <div style="
-            background-color: #4285F4;
+            background: linear-gradient(135deg, #4285F4, #34A853);
             color: white;
             padding: 15px 30px;
             border-radius: 8px;
             border: none;
             cursor: pointer;
-            font-size: 16px;
-            font-weight: 500;
+            font-size: 18px;
+            font-weight: 600;
             text-align: center;
-            margin: 20px 0;
+            margin: 30px 0;
             display: inline-block;
-        ">
-            <img src="https://cdn-icons-png.flaticon.com/512/2991/2991148.png" width="20" height="20" style="vertical-align: middle; margin-right: 10px;">
+            box-shadow: 0 4px 15px rgba(66, 133, 244, 0.3);
+            transition: all 0.3s ease;
+        "
+        onmouseover="this.style.transform='translateY(-2px)'; this.style.boxShadow='0 6px 20px rgba(66, 133, 244, 0.4)';"
+        onmouseout="this.style.transform='translateY(0)'; this.style.boxShadow='0 4px 15px rgba(66, 133, 244, 0.3)';"
+        >
+            <img src="https://cdn-icons-png.flaticon.com/512/2991/2991148.png" width="24" height="24" style="vertical-align: middle; margin-right: 12px;">
             Sign in with Google
         </div>
     </a>
     """, unsafe_allow_html=True)
     
+    # Instructions
+    with st.expander("📋 Setup Instructions", expanded=True):
+        st.markdown(f"""
+        **Secrets Status:**
+        - Google Client ID: {'✅ Loaded' if client_id and 'placeholder' not in client_id else '❌ Not configured'}
+        - Session Key: {'✅ Loaded' if session_key else '❌ Missing'}
+        
+        **Next Steps:**
+        1. Click "Sign in with Google" above
+        2. Login with your Google account
+        3. Grant permissions to the app
+        4. You'll be redirected back to the dashboard
+        
+        **Note:** First login may show "App not verified" warning.
+        Click "Advanced" → "Go to app" to continue.
+        """)
+    
+    # Footer
     st.markdown("---")
-    st.info("""
-    **Note:** First-time login might show "App not verified" warning.
-    Click "Continue" to proceed (this is normal for testing).
-    """)
+    st.caption("© 2024 Social Media Data Extractor | Secure OAuth Authentication")
 
 if __name__ == "__main__":
     main()