Update ui_generators.py

ui_generators.py

@@ -24,10 +24,11 @@ from config import (
 # logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(module)s - %(message)s')
 
 # --- Constants for Button Icons/Text ---
+# These are also defined/imported in app.py, ensure consistency
 BOMB_ICON = "💣"
 EXPLORE_ICON = "🧭"
 FORMULA_ICON = "ƒ"
-ACTIVE_ICON = "❌ Close"
+ACTIVE_ICON = "❌ Close" # Ensure this matches app.py
 
 
 def display_main_dashboard(token_state):
@@ -151,23 +152,23 @@ def run_mentions_tab_display(token_state):
     fig_plot_local = None 
     if not mentions_df.empty and "sentiment_label" in mentions_df.columns:
         try:
-            fig_plot_local, ax = plt.subplots(figsize=(6,4))
+            fig_plot_local, ax = plt.subplots(figsize=(6,4)) # Keep figsize for aspect ratio
             sentiment_counts = mentions_df["sentiment_label"].value_counts()
             sentiment_counts.plot(kind='bar', ax=ax, color=['#4CAF50', '#FFC107', '#F44336', '#9E9E9E', '#2196F3'])
-            ax.set_title("Mention Sentiment Distribution", y=1.03) # Adjusted y for Matplotlib title
+            ax.set_title("Mention Sentiment Distribution", y=1.03) 
             ax.set_ylabel("Count")
             plt.xticks(rotation=45, ha='right')
             
             plt.tight_layout() 
-            fig_plot_local.subplots_adjust(top=0.90) # MODIFIED: Add space at the top of the figure
-                                                  # This pushes plot content down from Gradio's label
+            fig_plot_local.subplots_adjust(top=0.90) 
             fig = fig_plot_local 
             logging.info("Mentions tab: Sentiment distribution plot generated.")
         except Exception as e:
             logging.error(f"Error generating mentions plot: {e}", exc_info=True)
             fig = None 
         finally:
-            if fig_plot_local and fig_plot_local is not plt:
+            # Ensure plt.close is called on the figure object, not plt itself if it's not the same
+            if fig_plot_local and fig_plot_local is not plt: # Check if fig_plot_local is a Figure object
                  plt.close(fig_plot_local)
     return mentions_html_output, fig
 
@@ -216,14 +217,14 @@ def run_follower_stats_tab_display(token_state):
                 organic=(FOLLOWER_STATS_ORGANIC_COLUMN, 'sum'),
                 paid=(FOLLOWER_STATS_PAID_COLUMN, 'sum')
             ).reset_index()
-            plot_data['_plot_month_dt'] = pd.to_datetime(plot_data['_plot_month'], format=UI_MONTH_FORMAT)
+            plot_data['_plot_month_dt'] = pd.to_datetime(plot_data['_plot_month'], format=UI_MONTH_FORMAT) # Ensure correct month format
             plot_data = plot_data.sort_values(by='_plot_month_dt')
 
 
-            fig_gains_local, ax_gains = plt.subplots(figsize=(10,5))
+            fig_gains_local, ax_gains = plt.subplots(figsize=(10,5)) # Keep figsize for aspect ratio
             ax_gains.plot(plot_data['_plot_month'], plot_data['organic'], marker='o', linestyle='-', label='Organic Gain')
             ax_gains.plot(plot_data['_plot_month'], plot_data['paid'], marker='x', linestyle='--', label='Paid Gain')
-            ax_gains.set_title("Monthly Follower Gains Over Time", y=1.03) # Adjusted y for Matplotlib title
+            ax_gains.set_title("Monthly Follower Gains Over Time", y=1.03) 
             ax_gains.set_ylabel("Follower Count")
             ax_gains.set_xlabel("Month (YYYY-MM)")
             plt.xticks(rotation=45, ha='right')
@@ -231,7 +232,7 @@ def run_follower_stats_tab_display(token_state):
             plt.grid(True, linestyle='--', alpha=0.7)
             
             plt.tight_layout()
-            fig_gains_local.subplots_adjust(top=0.90) # MODIFIED: Add space at the top of the figure
+            fig_gains_local.subplots_adjust(top=0.90) 
             plot_monthly_gains = fig_gains_local
             logging.info("Follower stats tab: Monthly gains plot generated.")
         else:
@@ -259,16 +260,16 @@ def run_follower_stats_tab_display(token_state):
             html_parts.append("<h4>Followers by Seniority (Top 10 Organic):</h4>")
             html_parts.append(seniority_df_sorted[[FOLLOWER_STATS_CATEGORY_COLUMN, FOLLOWER_STATS_ORGANIC_COLUMN, FOLLOWER_STATS_PAID_COLUMN]].head(10).to_html(escape=True, index=False, classes="table table-sm"))
 
-            fig_seniority_local, ax_seniority = plt.subplots(figsize=(8,5))
+            fig_seniority_local, ax_seniority = plt.subplots(figsize=(8,5)) # Keep figsize for aspect ratio
             top_n_seniority = seniority_df_sorted.nlargest(10, FOLLOWER_STATS_ORGANIC_COLUMN)
             ax_seniority.bar(top_n_seniority[FOLLOWER_STATS_CATEGORY_COLUMN], top_n_seniority[FOLLOWER_STATS_ORGANIC_COLUMN], color='skyblue')
-            ax_seniority.set_title("Follower Distribution by Seniority (Top 10 Organic)", y=1.03) # Adjusted y
+            ax_seniority.set_title("Follower Distribution by Seniority (Top 10 Organic)", y=1.03) 
             ax_seniority.set_ylabel("Organic Follower Count")
             plt.xticks(rotation=45, ha='right')
             plt.grid(axis='y', linestyle='--', alpha=0.7)
 
             plt.tight_layout()
-            fig_seniority_local.subplots_adjust(top=0.88) # MODIFIED: Add space. Experiment with this value.
+            fig_seniority_local.subplots_adjust(top=0.88) 
             plot_seniority_dist = fig_seniority_local
             logging.info("Follower stats tab: Seniority distribution plot generated.")
         else:
@@ -295,16 +296,16 @@ def run_follower_stats_tab_display(token_state):
             html_parts.append("<h4>Followers by Industry (Top 10 Organic):</h4>")
             html_parts.append(industry_df_sorted[[FOLLOWER_STATS_CATEGORY_COLUMN, FOLLOWER_STATS_ORGANIC_COLUMN, FOLLOWER_STATS_PAID_COLUMN]].head(10).to_html(escape=True, index=False, classes="table table-sm"))
 
-            fig_industry_local, ax_industry = plt.subplots(figsize=(8,5))
+            fig_industry_local, ax_industry = plt.subplots(figsize=(8,5)) # Keep figsize for aspect ratio
             top_n_industry = industry_df_sorted.nlargest(10, FOLLOWER_STATS_ORGANIC_COLUMN)
             ax_industry.bar(top_n_industry[FOLLOWER_STATS_CATEGORY_COLUMN], top_n_industry[FOLLOWER_STATS_ORGANIC_COLUMN], color='lightcoral')
-            ax_industry.set_title("Follower Distribution by Industry (Top 10 Organic)", y=1.03) # Adjusted y
+            ax_industry.set_title("Follower Distribution by Industry (Top 10 Organic)", y=1.03) 
             ax_industry.set_ylabel("Organic Follower Count")
             plt.xticks(rotation=45, ha='right')
             plt.grid(axis='y', linestyle='--', alpha=0.7)
             
             plt.tight_layout()
-            fig_industry_local.subplots_adjust(top=0.88) # MODIFIED: Add space. Experiment with this value.
+            fig_industry_local.subplots_adjust(top=0.88) 
             plot_industry_dist = fig_industry_local
             logging.info("Follower stats tab: Industry distribution plot generated.")
         else:
@@ -322,38 +323,30 @@ def run_follower_stats_tab_display(token_state):
     follower_html_output = "\n".join(html_parts)
     return follower_html_output, plot_monthly_gains, plot_seniority_dist, plot_industry_dist
 
+
 def create_analytics_plot_panel(plot_label_str, plot_id_str):
     """
     Creates an individual plot panel with its plot component and action buttons.
     Plot title and action buttons are on the same row.
     Returns the panel (Column), plot component, and button components.
     """
-    # Values for BOMB_ICON, EXPLORE_ICON, FORMULA_ICON should be sourced from where they are defined,
-    # e.g., imported from config or passed as arguments if they vary.
-    try:
-        # Assuming these are defined in your config.py and imported in app.py,
-        # they might not be directly available here unless explicitly passed or re-imported.
-        # For robustness, using string literals if not found.
-        from config import BOMB_ICON, EXPLORE_ICON, FORMULA_ICON
-    except ImportError:
-        logging.warning("Icons BOMB_ICON, EXPLORE_ICON, FORMULA_ICON not found in config for ui_generators, using defaults.")
-        BOMB_ICON = "💣"
-        EXPLORE_ICON = "🧭"
-        FORMULA_ICON = "ƒ"
-
+    # Icons are defined globally or imported. For this function, ensure they are accessible.
+    # If not using from config directly here, you might need to pass them or use fixed strings.
+    # Using fixed strings as a fallback if import fails, though they should be available via app.py's import.
+    local_bomb_icon, local_explore_icon, local_formula_icon = BOMB_ICON, EXPLORE_ICON, FORMULA_ICON
+    
     with gr.Column(visible=True) as panel_component: # Main container for this plot
-        with gr.Row(variant="compact"): # Removed vertical_align="center"
-            # Removed scale=3 from gr.Markdown as it's not a valid argument
-            gr.Markdown(f"#### {plot_label_str}") # Plot title
-            # Removed min_width=120 from gr.Row as it's not a valid argument
-            with gr.Row(elem_classes="plot-actions", scale=1): # Action buttons container
-                bomb_button = gr.Button(value=BOMB_ICON, variant="secondary", size="sm", min_width=30, elem_id=f"bomb_btn_{plot_id_str}")
-                formula_button = gr.Button(value=FORMULA_ICON, variant="secondary", size="sm", min_width=30, elem_id=f"formula_btn_{plot_id_str}")
-                explore_button = gr.Button(value=EXPLORE_ICON, variant="secondary", size="sm", min_width=30, elem_id=f"explore_btn_{plot_id_str}")
+        with gr.Row(variant="compact"): 
+            gr.Markdown(f"#### {plot_label_str}", scale=3) # Plot title (scale might help balance)
+            with gr.Row(elem_classes="plot-actions", scale=1, min_width=150): # Action buttons container, give it some min_width
+                bomb_button = gr.Button(value=local_bomb_icon, variant="secondary", size="sm", min_width=30, elem_id=f"bomb_btn_{plot_id_str}")
+                formula_button = gr.Button(value=local_formula_icon, variant="secondary", size="sm", min_width=30, elem_id=f"formula_btn_{plot_id_str}")
+                explore_button = gr.Button(value=local_explore_icon, variant="secondary", size="sm", min_width=30, elem_id=f"explore_btn_{plot_id_str}")
         
-        plot_component = gr.Plot(label=plot_label_str, show_label=False) # Label is shown in Markdown above
+        # MODIFIED: Added height to gr.Plot for consistent sizing
+        plot_component = gr.Plot(label=plot_label_str, show_label=False, height=350) # Adjust height as needed
 
-    logging.debug(f"Created analytics panel (styled) for: {plot_label_str} (ID: {plot_id_str})")
+    logging.debug(f"Created analytics panel for: {plot_label_str} (ID: {plot_id_str}) with fixed plot height.")
     return panel_component, plot_component, bomb_button, explore_button, formula_button
 
 
@@ -366,7 +359,7 @@ def build_analytics_tab_plot_area(plot_configs):
         - plot_ui_objects (dict): Dictionary of plot UI objects.
         - section_titles_map (dict): Dictionary mapping section names to their gr.Markdown title components.
     """
-    logging.info(f"Building plot area for {len(plot_configs)} analytics plots with interleaved section titles and styled panels.")
+    logging.info(f"Building plot area for {len(plot_configs)} analytics plots with interleaved section titles.")
     plot_ui_objects = {}
     section_titles_map = {} 
     
@@ -377,37 +370,35 @@ def build_analytics_tab_plot_area(plot_configs):
         current_plot_config = plot_configs[idx]
         current_section_name = current_plot_config["section"]
         
+        # Render section title if it's new for this block of plots
         if current_section_name != last_rendered_section:
             if current_section_name not in section_titles_map:
+                # Create the Markdown component for the section title
                 section_md_component = gr.Markdown(f"### {current_section_name}", visible=True)
                 section_titles_map[current_section_name] = section_md_component
                 logging.debug(f"Rendered and stored Markdown for section: {current_section_name}")
-            else:
-                # This case handles if a section name appears non-contiguously, ensure its component is made visible.
-                # The component itself is already created.
-                section_titles_map[current_section_name].visible = True 
-                logging.debug(f"Ensuring visibility for existing Markdown for section: {current_section_name}")
+            # No 'else' needed here for visibility, as it's handled by click handlers if sections are hidden/shown.
+            # The component is created once and its visibility is controlled elsewhere.
             last_rendered_section = current_section_name
 
-        with gr.Row(equal_height=False): # Row for one or two plots
+        with gr.Row(equal_height=False): # Row for one or two plots. equal_height=False allows plots to define their height.
             # --- Process the first plot in the row (config1) ---
             config1 = plot_configs[idx]
-            # Safety check, though current_section_name should match config1["section"] here
+            # Safety check for section consistency (should always pass if configs are ordered by section)
             if config1["section"] != current_section_name:
-                 logging.warning(f"Plot {config1['id']} section mismatch. Expected {current_section_name}, got {config1['section']}. Re-evaluating title.")
-                 # This indicates a potential issue in plot_configs order or logic, but try to recover title
-                 if config1["section"] not in section_titles_map:
-                     sec_md = gr.Markdown(f"### {config1['section']}", visible=True)
-                     section_titles_map[config1["section"]] = sec_md
-                 last_rendered_section = config1["section"]
-
+                logging.warning(f"Plot {config1['id']} section mismatch. Expected {current_section_name}, got {config1['section']}. This might affect layout if a new section title was expected.")
+                # If a new section starts unexpectedly, ensure its title is created if missing
+                if config1["section"] not in section_titles_map:
+                    sec_md = gr.Markdown(f"### {config1['section']}", visible=True) # Create and make visible
+                    section_titles_map[config1['section']] = sec_md
+                last_rendered_section = config1["section"] # Update the current section context
 
             panel_col1, plot_comp1, bomb_btn1, explore_btn1, formula_btn1 = \
-                create_analytics_plot_panel(config1["label"], config1["id"]) # Use the styled panel creator
+                create_analytics_plot_panel(config1["label"], config1["id"])
             plot_ui_objects[config1["id"]] = {
                 "plot_component": plot_comp1, "bomb_button": bomb_btn1,
                 "explore_button": explore_btn1, "formula_button": formula_btn1,
-                "label": config1["label"], "panel_component": panel_col1,
+                "label": config1["label"], "panel_component": panel_col1, # This is the gr.Column containing the plot and its actions
                 "section": config1["section"]
             }
             logging.debug(f"Created UI panel for plot_id: {config1['id']} in section {config1['section']}")
@@ -416,9 +407,10 @@ def build_analytics_tab_plot_area(plot_configs):
             # --- Process the second plot in the row (config2), if applicable ---
             if idx < len(plot_configs):
                 config2 = plot_configs[idx]
-                if config2["section"] == current_section_name: # Must be in the same section for the same row
+                # Only add to the same row if it's part of the same section
+                if config2["section"] == current_section_name: 
                     panel_col2, plot_comp2, bomb_btn2, explore_btn2, formula_btn2 = \
-                        create_analytics_plot_panel(config2["label"], config2["id"]) # Use the styled panel creator
+                        create_analytics_plot_panel(config2["label"], config2["id"])
                     plot_ui_objects[config2["id"]] = {
                         "plot_component": plot_comp2, "bomb_button": bomb_btn2,
                         "explore_button": explore_btn2, "formula_button": formula_btn2,
@@ -427,6 +419,8 @@ def build_analytics_tab_plot_area(plot_configs):
                     }
                     logging.debug(f"Created UI panel for plot_id: {config2['id']} in same row, section {config2['section']}")
                     idx += 1
+                # If the next plot is in a new section, it will be handled in the next iteration of the while loop,
+                # starting with a new section title and a new gr.Row.
     
     logging.info(f"Finished building plot area. Total plot objects: {len(plot_ui_objects)}. Section titles created: {len(section_titles_map)}")
     if len(plot_ui_objects) != len(plot_configs):