Update app.py

app.py

@@ -9,41 +9,33 @@ from analytics_fetch_and_rendering import fetch_and_render_analytics
 from mentions_dashboard import generate_mentions_dashboard
 
 # Import the function from your utils file
-from gradio_utils import get_url_user_token 
+from gradio_utils import get_url_user_token
 # Import the Bubble API call function (ensure filename matches: Bubble_API_Calls.py)
 from Bubble_API_Calls import fetch_linkedin_token_from_bubble
 
 # --- Session State dependent functions ---
 def check_token_status(current_token_state):
-    """Checks if a valid token exists in the session state."""
-    if current_token_state and current_token_state.get("token") and current_token_state.get("status"):
+    """Checks if a token exists in the session state."""
+    # Only check for the presence of the token
+    if current_token_state and current_token_state.get("token"):
         return "✅ Token available"
-    return "❌ Waiting for token…"
-
-def get_active_client_id(current_token_state):
-    """Gets the client_id from the session state if a token is available."""
-    if current_token_state and current_token_state.get("token") and current_token_state.get("status"):
-        return current_token_state.get("client_id", "Client ID not set")
-    return ""
+    return "❌ Token not available" # Changed message for clarity
 
 # --- 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, loads client_id from env, updates session state, 
+    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.
     Returns:
-        Tuple: (bubble_api_status_msg, overall_status, client_id_display, updated_token_state)
+        Tuple: (bubble_api_status_msg, overall_token_status_msg, 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
+    # Initialize new_token_state, removing the 'status' field
+    new_token_state = current_token_state.copy() if current_token_state else {"token": None, "client_id": None}
+    new_token_state["token"] = None # Assume no token until successfully fetched
 
     # Attempt to load Linkedin_client_id from environment variable
     linkedin_client_id_from_env = os.environ.get("Linkedin_client_id")
@@ -52,46 +44,49 @@ def process_and_store_bubble_token(url_user_token_str, current_token_state):
         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
+        # Return values: bubble_api_status, overall_token_status, new_token_state
+        return bubble_api_status_msg, check_token_status(new_token_state), new_token_state
+
+    # Store client_id from env in the state, regardless of token outcome (if env var exists)
+    new_token_state["client_id"] = linkedin_client_id_from_env
 
     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})"
-        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
+        # Client ID is known (if env var was found), but no token to fetch
+        return bubble_api_status_msg, check_token_status(new_token_state), new_token_state
 
-    print(f"Attempting to fetch token from Bubble with state: {url_user_token_str}")
+    print(f"Attempting to fetch token from Bubble with user token: {url_user_token_str}") # Changed "state" to "user token" for clarity
     parsed_token_dict = fetch_linkedin_token_from_bubble(url_user_token_str)
 
     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"] = 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."
+        new_token_state["token"] = parsed_token_dict # Store the actual token
+        bubble_api_status_msg = f"✅ Token successfully fetched from Bubble for user token: {url_user_token_str}. Client ID loaded."
         print(bubble_api_status_msg)
     else:
-        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."
+        bubble_api_status_msg = f"❌ Failed to fetch a valid token from Bubble for user token: {url_user_token_str}. Check console logs from Bubble_API_Calls.py."
         print(bubble_api_status_msg)
-        # 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
-
+        # Token fetch failed, token remains None. Client_id is already set if env var was found.
 
-    return bubble_api_status_msg, check_token_status(new_token_state), get_active_client_id(new_token_state), new_token_state
+    # Return values: bubble_api_status, overall_token_status, new_token_state
+    return bubble_api_status_msg, check_token_status(new_token_state), new_token_state
 
-# --- Guarded fetch functions (now use token_state) ---
+# --- Guarded fetch functions (now use token_state, checking only for token presence) ---
 def guarded_fetch_dashboard(current_token_state):
-    if not (current_token_state and current_token_state.get("status") and current_token_state.get("token")):
+    # Check only for the presence of the token
+    if not (current_token_state 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.get("client_id"), # Use .get for safety
-        current_token_state.get("token") 
+        current_token_state.get("token")
     )
     return html
 
 def guarded_fetch_analytics(current_token_state):
-    if not (current_token_state and current_token_state.get("status") and current_token_state.get("token")):
+    # Check only for the presence of the token
+    if not (current_token_state and current_token_state.get("token")):
         return (
             "<p style='color:red; text-align:center;'>❌ Access denied. No token available.</p>",
-            None, None, None, None, None, None, None 
+            None, None, None, None, None, None, None
         )
     client_id = current_token_state.get("client_id")
     token_data = current_token_state.get("token")
@@ -102,53 +97,54 @@ def guarded_fetch_analytics(current_token_state):
     return count_md, plot, growth_plot, avg_post_eng_rate, interaction_metrics, eb_metrics, mentions_vol_metrics, mentions_sentiment_metrics
 
 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")):
+    # Check only for the presence of the token
+    if not (current_token_state 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.get("client_id"),
-        current_token_state.get("token") 
+        current_token_state.get("token")
     )
     return html, fig
 
 # --- Build the Gradio UI ---
 with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
                title="LinkedIn Post Viewer & Analytics") as app:
-    
-    token_state = gr.State(value={"status": False, "token": None, "client_id": None})
+
+    # Modified token_state: removed 'status', client_id will be populated from env
+    token_state = gr.State(value={"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.")
 
     url_user_token_display = gr.Textbox(
-        label="User Token (from URL - Hidden)", 
-        interactive=False, 
+        label="User Token (from URL - Hidden)",
+        interactive=False,
         placeholder="Attempting to load from URL...",
-        visible=False 
+        visible=False # Kept hidden as per original logic
     )
-    
-    bubble_api_status_display = gr.Textbox(label="Bubble API Call Status", interactive=False, placeholder="Waiting for URL token...")
 
-    status_box = gr.Textbox(label="Overall Token Status", interactive=False) 
-    client_display = gr.Textbox(label="Client ID (Active)", interactive=False)
+    status_box = gr.Textbox(label="Overall Token Status", interactive=False, placeholder="Waiting for token check...") # Added placeholder
 
     app.load(
-        fn=get_url_user_token, 
-        inputs=None, 
-        outputs=[url_user_token_display] 
+        fn=get_url_user_token,
+        inputs=None,
+        outputs=[url_user_token_display]
     )
 
+    # Modified outputs for process_and_store_bubble_token
     url_user_token_display.change(
         fn=process_and_store_bubble_token,
-        inputs=[url_user_token_display, token_state], 
-        outputs=[bubble_api_status_display, status_box, client_display, token_state] 
+        inputs=[url_user_token_display, token_state],
+        outputs=[status_box, token_state] # Removed client_display
     )
-    
+
+    # app.load to initialize status_box 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 = gr.Timer(5.0) 
+    # Removed app.load for get_active_client_id and client_display
+
+    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)
+    # Removed timer.tick for get_active_client_id and client_display
 
     with gr.Tabs():
         with gr.TabItem("1️⃣ Dashboard"):
@@ -157,18 +153,18 @@ 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], 
+                inputs=[token_state],
                 outputs=[dashboard_html]
             )
 
         with gr.TabItem("2️⃣ Analytics"):
             gr.Markdown("View follower count and monthly gains for your organization.")
             fetch_analytics_btn = gr.Button("📈 Fetch Follower Analytics", variant="primary")
-            
+
             follower_count = gr.Markdown("<p style='text-align: center; color: #555;'>Waiting for token...</p>")
-            
+
             with gr.Row():
-                follower_plot = gr.Plot(visible=True) 
+                follower_plot = gr.Plot(visible=True)
                 growth_rate_plot = gr.Plot(visible=True)
             with gr.Row():
                 post_eng_rate_plot = gr.Plot(visible=True)
@@ -179,10 +175,10 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
             with gr.Row():
                 mentions_vol_data = gr.Plot(visible=True)
                 mentions_sentiment_data = gr.Plot(visible=True)
-            
+
             fetch_analytics_btn.click(
                 fn=guarded_fetch_analytics,
-                inputs=[token_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]
             )
 
@@ -193,9 +189,13 @@ 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], 
+                inputs=[token_state],
                 outputs=[mentions_html, mentions_plot]
             )
 
 if __name__ == "__main__":
-    app.launch(server_name="0.0.0.0", server_port=7860, share=True)
+    # Ensure the Linkedin_client_id environment variable is set before launching.
+    # You might want to add a check here and print a warning if it's not set.
+    if not os.environ.get("Linkedin_client_id"):
+        print("WARNING: The 'Linkedin_client_id' environment variable is not set. The application may not function correctly.")
+    app.launch(server_name="0.0.0.0", server_port=7860, share=True)