Update app.py

app.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 import gradio as gr
 import json
-# requests, os, urllib.parse are used by Bubble_API_Calls.py, not directly here anymore
-# but good to keep if you add other direct calls later.
+import os # Added to access environment variables
 
 # Assuming these custom modules exist in your project directory or Python path
 from Data_Fetching_and_Rendering import fetch_and_render_dashboard
@@ -30,7 +29,8 @@ def get_active_client_id(current_token_state):
 # --- Function to process and store token from Bubble ---
 def process_and_store_bubble_token(url_user_token_str, current_token_state):
     """
-    Fetches token from Bubble, updates session state, and returns UI update values.
+    Fetches token from Bubble, loads client_id from env, updates session state, 
+    and returns UI update values.
     Args:
         url_user_token_str: The token string extracted from the URL.
         current_token_state: The current session state for the token.
@@ -38,11 +38,25 @@ def process_and_store_bubble_token(url_user_token_str, current_token_state):
         Tuple: (bubble_api_status_msg, overall_status, client_id_display, updated_token_state)
     """
     bubble_api_status_msg = "Waiting for URL token..."
+    # Ensure new_token_state is a new dictionary, not a reference to current_token_state
     new_token_state = current_token_state.copy() if current_token_state else {"status": False, "token": None, "client_id": None}
+    # Default to current state values unless explicitly changed
+    new_token_state["status"] = False # Assume failure until success
+    new_token_state["token"] = None
+    # new_token_state["client_id"] will be set or cleared based on env var
+
+    # Attempt to load Linkedin_client_id from environment variable
+    linkedin_client_id_from_env = os.environ.get("Linkedin_client_id")
+
+    if not linkedin_client_id_from_env:
+        bubble_api_status_msg = "❌ CRITICAL ERROR: 'Linkedin_client_id' environment variable not set."
+        print(bubble_api_status_msg)
+        new_token_state["client_id"] = "ENV VAR MISSING" # Indicate error in state
+        return bubble_api_status_msg, check_token_status(new_token_state), get_active_client_id(new_token_state), new_token_state
 
     if not url_user_token_str or "not found" in url_user_token_str or "Could not access" in url_user_token_str:
         bubble_api_status_msg = f"ℹ️ No valid user token from URL to query Bubble. ({url_user_token_str})"
-        # Even if no valid URL token, return current status based on existing state
+        new_token_state["client_id"] = linkedin_client_id_from_env # Client ID is known, but no token
         return bubble_api_status_msg, check_token_status(new_token_state), get_active_client_id(new_token_state), new_token_state
 
     print(f"Attempting to fetch token from Bubble with state: {url_user_token_str}")
@@ -51,23 +65,14 @@ def process_and_store_bubble_token(url_user_token_str, current_token_state):
     if parsed_token_dict and isinstance(parsed_token_dict, dict) and "access_token" in parsed_token_dict:
         new_token_state["status"] = True
         new_token_state["token"] = parsed_token_dict
-        new_token_state["client_id"] = f"Bubble (state: {url_user_token_str})"
-        bubble_api_status_msg = f"✅ Token successfully fetched from Bubble for state: {url_user_token_str}"
+        new_token_state["client_id"] = linkedin_client_id_from_env # Use client_id from env var
+        bubble_api_status_msg = f"✅ Token successfully fetched from Bubble for state: {url_user_token_str}. Client ID loaded."
         print(bubble_api_status_msg)
     else:
-        # Fetch failed or no valid token returned, keep previous state or mark as no token
-        # If you want a Bubble failure to explicitly clear any old token:
-        # new_token_state["status"] = False
-        # new_token_state["token"] = None
-        # new_token_state["client_id"] = None 
-        # For now, it just means the Bubble fetch didn't provide a new one.
         bubble_api_status_msg = f"❌ Failed to fetch a valid token from Bubble for state: {url_user_token_str}. Check console logs from Bubble_API_Calls.py."
         print(bubble_api_status_msg)
-        # If the goal is that ONLY a successful bubble fetch provides a token, then reset status:
-        new_token_state["status"] = False
-        new_token_state["token"] = None
-        # client_id might be kept or cleared based on preference
-        # new_token_state["client_id"] = f"Bubble fetch failed (state: {url_user_token_str})"
+        # Token fetch failed, status remains False, token remains None
+        new_token_state["client_id"] = linkedin_client_id_from_env # Client ID is known, but no token
 
 
     return bubble_api_status_msg, check_token_status(new_token_state), get_active_client_id(new_token_state), new_token_state
@@ -77,8 +82,8 @@ def guarded_fetch_dashboard(current_token_state):
     if not (current_token_state and current_token_state.get("status") and current_token_state.get("token")):
         return "<p style='color:red; text-align:center;'>❌ Access denied. No token available.</p>"
     html = fetch_and_render_dashboard(
-        current_token_state["client_id"],
-        current_token_state["token"] 
+        current_token_state.get("client_id"), # Use .get for safety
+        current_token_state.get("token") 
     )
     return html
 
@@ -88,8 +93,8 @@ def guarded_fetch_analytics(current_token_state):
             "<p style='color:red; text-align:center;'>❌ Access denied. No token available.</p>",
             None, None, None, None, None, None, None 
         )
-    client_id = current_token_state["client_id"]
-    token_data = current_token_state["token"]
+    client_id = current_token_state.get("client_id")
+    token_data = current_token_state.get("token")
     count_md, plot, growth_plot, avg_post_eng_rate, interaction_metrics, eb_metrics, mentions_vol_metrics, mentions_sentiment_metrics = fetch_and_render_analytics(
         client_id,
         token_data
@@ -100,8 +105,8 @@ def run_mentions_and_load(current_token_state):
     if not (current_token_state and current_token_state.get("status") and current_token_state.get("token")):
         return ("<p style='color:red; text-align:center;'>❌ Access denied. No token available.</p>", None)
     html, fig = generate_mentions_dashboard(
-        current_token_state["client_id"],
-        current_token_state["token"] 
+        current_token_state.get("client_id"),
+        current_token_state.get("token") 
     )
     return html, fig
 
@@ -109,14 +114,11 @@ def run_mentions_and_load(current_token_state):
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
                title="LinkedIn Post Viewer & Analytics") as app:
     
-    # Session state to store the token info
-    # Initial value is a dictionary representing an unauthenticated state.
     token_state = gr.State(value={"status": False, "token": None, "client_id": None})
 
     gr.Markdown("# 🚀 LinkedIn Organization Post Viewer & Analytics")
     gr.Markdown("Token is supplied via URL parameter for Bubble.io lookup. Then explore dashboard and analytics.")
 
-    # Hidden textbox to capture token from URL
     url_user_token_display = gr.Textbox(
         label="User Token (from URL - Hidden)", 
         interactive=False, 
@@ -124,40 +126,30 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
         visible=False 
     )
     
-    # Display for Bubble API call status
     bubble_api_status_display = gr.Textbox(label="Bubble API Call Status", interactive=False, placeholder="Waiting for URL token...")
 
-    # Overall status displays
     status_box = gr.Textbox(label="Overall Token Status", interactive=False) 
     client_display = gr.Textbox(label="Client ID (Active)", interactive=False)
-    # Note: The textbox for displaying the actual token is removed.
 
-    # --- Load URL parameter on app start & Link to Bubble Fetch ---
     app.load(
         fn=get_url_user_token, 
-        inputs=None, # get_url_user_token takes gr.Request implicitly
+        inputs=None, 
         outputs=[url_user_token_display] 
     )
 
-    # When the hidden url_user_token_display changes (due to app.load),
-    # trigger the Bubble API call and update session state.
     url_user_token_display.change(
         fn=process_and_store_bubble_token,
-        inputs=[url_user_token_display, token_state], # Pass current state
-        outputs=[bubble_api_status_display, status_box, client_display, token_state] # Update UI and state
+        inputs=[url_user_token_display, token_state], 
+        outputs=[bubble_api_status_display, status_box, client_display, token_state] 
     )
     
-    # Initial UI state based on initial token_state
     app.load(fn=check_token_status, inputs=[token_state], outputs=status_box)
     app.load(fn=get_active_client_id, inputs=[token_state], outputs=client_display)
     
-    # Timer to periodically update status (e.g., if token could expire or be managed externally)
-    # This might be less critical if token acquisition is only at the start via URL.
-    timer = gr.Timer(5.0) # Poll every 5 seconds, adjust as needed
+    timer = gr.Timer(5.0) 
     timer.tick(fn=check_token_status, inputs=[token_state], outputs=status_box)
     timer.tick(fn=get_active_client_id, inputs=[token_state], outputs=client_display)
 
-    # Tabs for functionality
     with gr.Tabs():
         with gr.TabItem("1️⃣ Dashboard"):
             gr.Markdown("View your organization's recent posts and their engagement statistics.")
@@ -165,7 +157,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
             dashboard_html = gr.HTML(value="<p style='text-align: center; color: #555;'>Waiting for token...</p>")
             fetch_dashboard_btn.click(
                 fn=guarded_fetch_dashboard,
-                inputs=[token_state], # Pass session state
+                inputs=[token_state], 
                 outputs=[dashboard_html]
             )
 
@@ -190,7 +182,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
             
             fetch_analytics_btn.click(
                 fn=guarded_fetch_analytics,
-                inputs=[token_state], # Pass session state
+                inputs=[token_state], 
                 outputs=[follower_count, follower_plot, growth_rate_plot, post_eng_rate_plot, interaction_data, eb_data, mentions_vol_data, mentions_sentiment_data]
             )
 
@@ -201,11 +193,9 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
             mentions_plot = gr.Plot(visible=True)
             fetch_mentions_btn.click(
                 fn=run_mentions_and_load,
-                inputs=[token_state], # Pass session state
+                inputs=[token_state], 
                 outputs=[mentions_html, mentions_plot]
             )
 
-# Launch the app
 if __name__ == "__main__":
-    # Ensure the 'Bubble_API' environment variable is set where this app is run.
     app.launch(server_name="0.0.0.0", server_port=7860, share=True)