Update app.py

app.py

@@ -21,11 +21,23 @@ from ui_generators import (
     run_mentions_tab_display,
     run_follower_stats_tab_display
 )
-import analytics_plot_generators 
-import analytics_data_processing
+# Corrected import for analytics_data_processing
+from analytics_data_processing import prepare_filtered_analytics_data 
+from analytics_plot_generator import (
+    generate_posts_activity_plot, generate_engagement_type_plot,
+    generate_mentions_activity_plot, generate_mention_sentiment_plot,
+    # generate_total_follower_growth_plot, # Kept for reference, decide if needed
+    generate_followers_count_over_time_plot,
+    generate_followers_growth_rate_plot,
+    generate_followers_by_demographics_plot,
+    generate_engagement_rate_over_time_plot,
+    generate_reach_over_time_plot,
+    generate_impressions_over_time_plot,
+    create_placeholder_plot # For initializing plots
+)
 
 # Configure logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(module)s - %(message)s')
 
 # --- Analytics Tab: Plot Update Function ---
 def update_analytics_plots(token_state_value, date_filter_option, custom_start_date, custom_end_date):
@@ -37,34 +49,73 @@ def update_analytics_plots(token_state_value, date_filter_option, custom_start_d
     if not token_state_value or not token_state_value.get("token"):
         message = "❌ Access denied. No token. Cannot generate analytics."
         logging.warning(message)
-        return message, None, None, None, None, None 
+        # Return placeholders for all plots
+        num_expected_plots = 13 # Number of plots we expect to generate
+        placeholder_figs = [create_placeholder_plot(title="Access Denied", message="No token.") for _ in range(num_expected_plots)]
+        return [message] + placeholder_figs
 
-    # --- Prepare Data (Moved to analytics_data_processing) ---
+    # --- Prepare Data ---
     try:
-        filtered_posts_df, filtered_mentions_df, follower_stats_df, start_dt_for_msg, end_dt_for_msg = \
-            analytics_data_processing.prepare_filtered_analytics_data(
+        # Updated unpacking to match prepare_filtered_analytics_data return signature
+        (filtered_merged_posts_df, 
+         filtered_mentions_df, 
+         date_filtered_follower_stats_df, 
+         raw_follower_stats_df, 
+         start_dt_for_msg, end_dt_for_msg) = \
+            prepare_filtered_analytics_data( # Direct call to imported function
                 token_state_value, date_filter_option, custom_start_date, custom_end_date
             )
     except Exception as e:
         error_msg = f"❌ Error preparing analytics data: {e}"
         logging.error(error_msg, exc_info=True)
-        return error_msg, None, None, None, None, None
+        num_expected_plots = 13
+        placeholder_figs = [create_placeholder_plot(title="Data Preparation Error", message=str(e)) for _ in range(num_expected_plots)]
+        return [error_msg] + placeholder_figs
 
-    # Date column names (still needed for plot generators)
+    # Date column names (still needed for plot generators if not passed as args or if defaults are not suitable)
     date_column_posts = token_state_value.get("config_date_col_posts", "published_at")
     date_column_mentions = token_state_value.get("config_date_col_mentions", "date")
     date_column_followers = token_state_value.get("config_date_col_followers", "date") 
 
-    logging.info(f"Data for plotting - Filtered posts: {len(filtered_posts_df)} rows, Filtered Mentions: {len(filtered_mentions_df)} rows.")
-    logging.info(f"Follower stats (unfiltered by global range): {len(follower_stats_df)} rows.")
+    logging.info(f"Data for plotting - Filtered Merged Posts: {len(filtered_merged_posts_df)} rows, Filtered Mentions: {len(filtered_mentions_df)} rows.")
+    logging.info(f"Date-Filtered Follower Stats: {len(date_filtered_follower_stats_df)} rows, Raw Follower Stats: {len(raw_follower_stats_df)} rows.")
 
     # --- Generate Plots ---
     try:
-        plot_posts_activity = analytics_plot_generators.generate_posts_activity_plot(filtered_posts_df, date_column_posts)
-        plot_engagement_type = analytics_plot_generators.generate_engagement_type_plot(filtered_posts_df) 
-        plot_mentions_activity = analytics_plot_generators.generate_mentions_activity_plot(filtered_mentions_df, date_column_mentions)
-        plot_mention_sentiment = analytics_plot_generators.generate_mention_sentiment_plot(filtered_mentions_df) 
-        plot_follower_growth = analytics_plot_generators.generate_follower_growth_plot(follower_stats_df, date_column_followers)
+        # Existing plots (using filtered_merged_posts_df for post-related plots)
+        plot_posts_activity = generate_posts_activity_plot(filtered_merged_posts_df, date_column=date_column_posts)
+        # Ensure likeCount, commentCount, shareCount are in filtered_merged_posts_df
+        plot_engagement_type = generate_engagement_type_plot(filtered_merged_posts_df) 
+        plot_mentions_activity = generate_mentions_activity_plot(filtered_mentions_df, date_column=date_column_mentions)
+        plot_mention_sentiment = generate_mention_sentiment_plot(filtered_mentions_df) 
+
+        # New Follower Dynamics Plots
+        plot_followers_count = generate_followers_count_over_time_plot(
+            date_filtered_follower_stats_df, 
+            date_column=date_column_followers, # Make sure 'date' is the correct column name
+            count_column='follower_count_o', # Or relevant count column
+            type_filter_column='follower_count_type',
+            type_value='follower_gains_monthly' # As per your requirement
+        )
+        plot_followers_growth_rate = generate_followers_growth_rate_plot(
+            date_filtered_follower_stats_df,
+            date_column=date_column_followers,
+            count_column='follower_count_o',
+            type_filter_column='follower_count_type',
+            type_value='follower_gains_monthly'
+        )
+
+        # New Follower Demographics Plots (using raw_follower_stats_df)
+        plot_followers_by_location = generate_followers_by_demographics_plot(raw_follower_stats_df, category_col='category_name', count_column='follower_count_o', type_filter_column='follower_count_type', type_value='follower_geo', plot_title="Followers by Location")
+        plot_followers_by_role = generate_followers_by_demographics_plot(raw_follower_stats_df, category_col='category_name', count_column='follower_count_o', type_filter_column='follower_count_type', type_value='follower_function', plot_title="Followers by Role")
+        plot_followers_by_industry = generate_followers_by_demographics_plot(raw_follower_stats_df, category_col='category_name', count_column='follower_count_o', type_filter_column='follower_count_type', type_value='follower_industry', plot_title="Followers by Industry")
+        plot_followers_by_seniority = generate_followers_by_demographics_plot(raw_follower_stats_df, category_col='category_name', count_column='follower_count_o', type_filter_column='follower_count_type', type_value='follower_seniority', plot_title="Followers by Seniority")
+
+        # New Post Engagement/Performance Plots (using filtered_merged_posts_df)
+        # Ensure 'engagement', 'clickCount', 'impressionCount' are in filtered_merged_posts_df
+        plot_engagement_rate = generate_engagement_rate_over_time_plot(filtered_merged_posts_df, date_column=date_column_posts, engagement_rate_col='engagement')
+        plot_reach_over_time = generate_reach_over_time_plot(filtered_merged_posts_df, date_column=date_column_posts, reach_col='clickCount')
+        plot_impressions_over_time = generate_impressions_over_time_plot(filtered_merged_posts_df, date_column=date_column_posts, impressions_col='impressionCount')
 
         message = f"📊 Analytics updated for period: {date_filter_option}"
         if date_filter_option == "Custom Range":
@@ -72,14 +123,22 @@ def update_analytics_plots(token_state_value, date_filter_option, custom_start_d
             e_display = end_dt_for_msg.strftime('%Y-%m-%d') if end_dt_for_msg else "Any" 
             message += f" (From: {s_display} To: {e_display})"
         
-        num_plots_generated = sum(1 for p in [plot_posts_activity, plot_engagement_type, plot_mentions_activity, plot_mention_sentiment, plot_follower_growth] if p is not None)
+        all_generated_plots = [
+            plot_posts_activity, plot_engagement_type, plot_mentions_activity, plot_mention_sentiment,
+            plot_followers_count, plot_followers_growth_rate,
+            plot_followers_by_location, plot_followers_by_role, plot_followers_by_industry, plot_followers_by_seniority,
+            plot_engagement_rate, plot_reach_over_time, plot_impressions_over_time
+        ]
+        num_plots_generated = sum(1 for p in all_generated_plots if p is not None and not isinstance(p, str)) # Check it's a figure
         logging.info(f"Successfully generated {num_plots_generated} plots.")
 
-        return message, plot_posts_activity, plot_engagement_type, plot_mentions_activity, plot_mention_sentiment, plot_follower_growth
+        return [message] + all_generated_plots
     except Exception as e:
         error_msg = f"❌ Error generating analytics plots: {e}"
         logging.error(error_msg, exc_info=True)
-        return error_msg, None, None, None, None, None
+        num_expected_plots = 13
+        placeholder_figs = [create_placeholder_plot(title="Plot Generation Error", message=str(e)) for _ in range(num_expected_plots)]
+        return [error_msg] + placeholder_figs
 
 
 # --- Gradio UI Blocks ---
@@ -88,12 +147,14 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
 
     token_state = gr.State(value={
         "token": None, "client_id": None, "org_urn": None,
-        "bubble_posts_df": pd.DataFrame(), "fetch_count_for_api": 0,
+        "bubble_posts_df": pd.DataFrame(), 
+        "bubble_post_stats_df": pd.DataFrame(), # Added for merged post data
         "bubble_mentions_df": pd.DataFrame(),
         "bubble_follower_stats_df": pd.DataFrame(),
+        "fetch_count_for_api": 0, # Retained from original if used elsewhere
         "url_user_token_temp_storage": None,
         "config_date_col_posts": "published_at", 
-        "config_date_col_mentions": "date",      
+        "config_date_col_mentions": "date",     
         "config_date_col_followers": "date"    
     })
 
@@ -107,7 +168,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
     def initial_load_sequence(url_token, org_urn_val, current_state):
         logging.info(f"Initial load sequence triggered. Org URN: {org_urn_val}, URL Token: {'Present' if url_token else 'Absent'}")
         status_msg, new_state, btn_update = process_and_store_bubble_token(url_token, org_urn_val, current_state)
-        dashboard_content = display_main_dashboard(new_state)
+        dashboard_content = display_main_dashboard(new_state) # Assumes this function exists and works
         return status_msg, new_state, btn_update, dashboard_content
 
     with gr.Tabs() as tabs:
@@ -144,17 +205,16 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
 
         with gr.TabItem("2️⃣ Analytics", id="tab_analytics"):
             gr.Markdown("## 📈 LinkedIn Performance Analytics")
-            gr.Markdown("Select a date range to filter Posts and Mentions analytics. Follower analytics show overall trends and are not affected by this date filter.")
+            gr.Markdown("Select a date range to filter Posts and Mentions analytics. Follower demographic plots show overall latest data. Follower time-series plots respect the selected date range if applicable to their data source (e.g. monthly gains).")
             
             analytics_status_md = gr.Markdown("Analytics status will appear here...")
 
             with gr.Row():
                 date_filter_selector = gr.Radio(
                     ["All Time", "Last 7 Days", "Last 30 Days", "Custom Range"],
-                    label="Select Date Range (for Posts & Mentions)",
+                    label="Select Date Range (for Posts, Mentions, and some Follower time-series)",
                     value="Last 30 Days"
                 )
-                # Corrected to gr.DateTime
                 custom_start_date_picker = gr.DateTime(label="Start Date (Custom)", visible=False, include_time=False, type="string")
                 custom_end_date_picker = gr.DateTime(label="End Date (Custom)", visible=False, include_time=False, type="string")
             
@@ -164,7 +224,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
                 is_custom = selection == "Custom Range"
                 return gr.update(visible=is_custom), gr.update(visible=is_custom)
 
-
             date_filter_selector.change(
                 fn=toggle_custom_date_pickers,
                 inputs=[date_filter_selector],
@@ -181,32 +240,58 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
                 mentions_activity_plot = gr.Plot(label="Mentions Activity Over Time")
                 mention_sentiment_plot = gr.Plot(label="Mention Sentiment Distribution")
 
-            gr.Markdown("### Follower Overview (Not Filtered by Date Range Selector)")
+            gr.Markdown("### Follower Dynamics")
+            with gr.Row():
+                followers_count_plot = gr.Plot(label="Followers Count Over Time (e.g., Monthly Gains)")
+                followers_growth_rate_plot = gr.Plot(label="Followers Growth Rate (e.g., Monthly Gains)")
+            
+            gr.Markdown("### Follower Demographics (Overall Latest Data)")
+            with gr.Row():
+                followers_by_location_plot = gr.Plot(label="Followers by Location")
+                followers_by_role_plot = gr.Plot(label="Followers by Role (Function)")
+            with gr.Row():
+                followers_by_industry_plot = gr.Plot(label="Followers by Industry")
+                followers_by_seniority_plot = gr.Plot(label="Followers by Seniority")
+
+            gr.Markdown("### Post Performance Insights (Filtered by Date)")
+            with gr.Row(): # Single plot, can take full width or be in a row
+                engagement_rate_plot = gr.Plot(label="Engagement Rate Over Time")
             with gr.Row():
-                follower_growth_plot = gr.Plot(label="Follower Growth Over Time")
+                reach_over_time_plot = gr.Plot(label="Reach Over Time (Clicks)")
+                impressions_over_time_plot = gr.Plot(label="Impressions Over Time")
+
+            # Define all plot outputs for the analytics tab
+            analytics_plot_outputs = [
+                analytics_status_md, posts_activity_plot, engagement_type_plot, 
+                mentions_activity_plot, mention_sentiment_plot,
+                followers_count_plot, followers_growth_rate_plot,
+                followers_by_location_plot, followers_by_role_plot, 
+                followers_by_industry_plot, followers_by_seniority_plot,
+                engagement_rate_plot, reach_over_time_plot, impressions_over_time_plot
+            ]
 
             apply_filter_btn.click(
                 fn=update_analytics_plots,
                 inputs=[token_state, date_filter_selector, custom_start_date_picker, custom_end_date_picker],
-                outputs=[analytics_status_md, posts_activity_plot, engagement_type_plot, mentions_activity_plot, mention_sentiment_plot, follower_growth_plot],
+                outputs=analytics_plot_outputs,
                 show_progress="full"
             )
             
-            sync_click_event.then(
+            # Also update analytics plots after a data sync
+            sync_click_event.then( # Chaining after the sync operations
                 fn=update_analytics_plots,
                 inputs=[token_state, date_filter_selector, custom_start_date_picker, custom_end_date_picker],
-                outputs=[analytics_status_md, posts_activity_plot, engagement_type_plot, mentions_activity_plot, mention_sentiment_plot, follower_growth_plot],
+                outputs=analytics_plot_outputs,
                 show_progress="full"
             )
 
-
         with gr.TabItem("3️⃣ Mentions", id="tab_mentions"):
             refresh_mentions_display_btn = gr.Button("🔄 Refresh Mentions Display (from local data)", variant="secondary")
             mentions_html = gr.HTML("Mentions data loads from Bubble after sync. Click refresh to view current local data.")
             mentions_sentiment_dist_plot = gr.Plot(label="Mention Sentiment Distribution") 
             refresh_mentions_display_btn.click(
                 fn=run_mentions_tab_display, inputs=[token_state],
-                outputs=[mentions_html, mentions_sentiment_dist_plot],
+                outputs=[mentions_html, mentions_sentiment_dist_plot], # Assuming run_mentions_tab_display returns these
                 show_progress="full"
             )
 
@@ -221,7 +306,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
 
             refresh_follower_stats_btn.click(
                 fn=run_follower_stats_tab_display, inputs=[token_state],
-                outputs=[follower_stats_html, fs_plot_monthly_gains, fs_plot_seniority, fs_plot_industry],
+                outputs=[follower_stats_html, fs_plot_monthly_gains, fs_plot_seniority, fs_plot_industry], # Assuming this matches
                 show_progress="full"
             )