Update ui_generators.py

ui_generators.py

@@ -23,6 +23,12 @@ from config import (
 # Configure logging for this module if not already configured at app level
 # logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(module)s - %(message)s')
 
+# --- Constants for Button Icons/Text ---
+BOMB_ICON = "💣 Insights"
+EXPLORE_ICON = "🔍 Explore"
+FORMULA_ICON = "ƒ Formula"
+ACTIVE_ICON = "❌ Close"
+
 
 def display_main_dashboard(token_state):
     """Generates HTML for the main dashboard display using data from token_state."""
@@ -157,9 +163,9 @@ def run_mentions_tab_display(token_state):
             logging.error(f"Error generating mentions plot: {e}", exc_info=True)
             # fig remains None
         finally:
-            if fig is not None and fig is not plt: # Ensure we don't close the global plt if fig is just an alias
-                 plt.close(fig) # Close the specific figure to free memory
-            elif fig is None and plt.get_fignums(): # If fig is None but some global figure might exist from error
+            if fig is not None and fig is not plt: 
+                 plt.close(fig) 
+            elif fig is None and plt.get_fignums(): 
                  plt.close('all')
 
 
@@ -208,7 +214,7 @@ def run_follower_stats_tab_display(token_state):
             plot_data = monthly_gains_df_sorted_plot.groupby('_plot_month').agg(
                 organic=(FOLLOWER_STATS_ORGANIC_COLUMN, 'sum'),
                 paid=(FOLLOWER_STATS_PAID_COLUMN, 'sum')
-            ).reset_index().sort_values(by='_plot_month') # Ensure month order for plot
+            ).reset_index().sort_values(by='_plot_month') 
 
             fig_gains, ax_gains = plt.subplots(figsize=(10,5))
             ax_gains.plot(plot_data['_plot_month'], plot_data['organic'], marker='o', linestyle='-', label='Organic Gain')
@@ -307,75 +313,77 @@ def run_follower_stats_tab_display(token_state):
     return follower_html_output, plot_monthly_gains, plot_seniority_dist, plot_industry_dist
 
 
-# --- NEW UI GENERATION LOGIC FOR ANALYTICS TAB ---
+# --- UI GENERATION LOGIC FOR ANALYTICS TAB ---
 def create_analytics_plot_panel(label, plot_id_str):
     """
     Creates a Gradio Column representing a single plot panel.
-    This panel contains the plot and its associated "bomb" button to the right.
-    Returns the panel (gr.Column), the plot component, and the bomb button.
+    This panel contains the plot and its associated action buttons.
+    Returns:
+        panel_col (gr.Column): The main column for this plot panel.
+        plot_component (gr.Plot): The plot display area.
+        bomb_button (gr.Button): Insights button.
+        explore_button (gr.Button): Explore/Zoom button.
+        formula_button (gr.Button): Formula button.
     """
-    with gr.Column() as panel_col: # This is the component that will go into the two-column rows
-        with gr.Row(equal_height=False, variant="panel"): # A sub-row for plot and button
-            with gr.Column(scale=8): # Adjust scale as needed for plot vs button
-                plot_component = gr.Plot(label=label)
-            with gr.Column(scale=2, min_width=70): # Removed vertical_alignment
-                bomb_button = gr.Button("💣", variant="secondary", size="sm", elem_id=f"bomb_{plot_id_str}")
-    return panel_col, plot_component, bomb_button
+    with gr.Column() as panel_col: 
+        with gr.Row(equal_height=False, variant="panel"): 
+            plot_component = gr.Plot(label=label, scale=8) # Plot takes more space
+            with gr.Column(scale=2, min_width=100): # Column for all buttons
+                bomb_button = gr.Button(BOMB_ICON, variant="secondary", size="sm", elem_id=f"bomb_{plot_id_str}")
+                explore_button = gr.Button(EXPLORE_ICON, variant="secondary", size="sm", elem_id=f"explore_{plot_id_str}")
+                formula_button = gr.Button(FORMULA_ICON, variant="secondary", size="sm", elem_id=f"formula_{plot_id_str}")
+    return panel_col, plot_component, bomb_button, explore_button, formula_button
 
 def build_analytics_tab_plot_area(plot_configs):
     """
     Builds the main plot area for the Analytics tab, arranging plot panels into rows of two.
-    This function should be called within the "Analytics" TabItem context in app.py,
-    specifically within the main column designated for plots.
     Returns a dictionary of plot UI objects.
     """
     logging.info(f"Building plot area for {len(plot_configs)} analytics plots.")
-    plot_ui_objects = {} # Stores {"plot_id": {"plot_component": gr.Plot, "bomb_button": gr.Button, "label": str}}
+    # Stores {"plot_id": {"plot_component": gr.Plot, "bomb_button": gr.Button, "explore_button": gr.Button, "formula_button": gr.Button, "label": str, "panel_component": gr.Column}}
+    plot_ui_objects = {} 
     
     current_section_title = ""
     
-    # Iterate through plot_configs to create sections and then rows of plots
-    for i in range(0, len(plot_configs), 2): # Process in pairs for two plots per row
-        # Handle section header
-        # Check if the section of the first plot in the potential pair is new
+    for i in range(0, len(plot_configs), 2): 
         if plot_configs[i]["section"] != current_section_title:
             current_section_title = plot_configs[i]["section"]
             gr.Markdown(f"### {current_section_title}")
 
-        with gr.Row(): # Create a new row for up to two plot panels
+        with gr.Row(equal_height=False): # Main row for two plot panels
             # First plot in the pair
             config1 = plot_configs[i]
-            panel_col1, plot_component1, bomb_button1 = \
+            panel_col1, plot_comp1, bomb_btn1, explore_btn1, formula_btn1 = \
                 create_analytics_plot_panel(config1["label"], config1["id"])
             plot_ui_objects[config1["id"]] = {
-                "plot_component": plot_component1,
-                "bomb_button": bomb_button1,
-                "label": config1["label"]
+                "plot_component": plot_comp1,
+                "bomb_button": bomb_btn1,
+                "explore_button": explore_btn1,
+                "formula_button": formula_btn1,
+                "label": config1["label"],
+                "panel_component": panel_col1 # Store the panel itself for visibility/scale changes
             }
             logging.debug(f"Created UI panel for plot_id: {config1['id']}")
 
             # Second plot in the pair, if it exists
             if i + 1 < len(plot_configs):
                 config2 = plot_configs[i+1]
-                # Check if the second plot starts a new section (edge case if sections aren't aligned with pairs)
-                if config2["section"] != current_section_title:
-                    # This row is finished, start a new section header for the next plot
-                    # This might leave the current row with only one plot if sections change mid-pair
-                    # For simplicity, we assume sections align well or the header appears before the row with the new section's first plot
-                    # The current loop structure will create a new header before the next gr.Row if section changes
-                    pass # The next iteration's section check will handle this.
-
-                panel_col2, plot_component2, bomb_button2 = \
-                    create_analytics_plot_panel(config2["label"], config2["id"])
-                plot_ui_objects[config2["id"]] = {
-                    "plot_component": plot_component2,
-                    "bomb_button": bomb_button2,
-                    "label": config2["label"]
-                }
-                logging.debug(f"Created UI panel for plot_id: {config2['id']}")
-            else:
-                # If there's no second plot, this row will just have one panel
-                pass
+                # If the second plot is in a new section, this row will only contain the first plot.
+                # The new section header for config2 will be handled in the next iteration of the outer loop.
+                if config2["section"] == current_section_title:
+                    panel_col2, plot_comp2, bomb_btn2, explore_btn2, formula_btn2 = \
+                        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,
+                        "label": config2["label"],
+                        "panel_component": panel_col2
+                    }
+                    logging.debug(f"Created UI panel for plot_id: {config2['id']}")
+                # If config2 is in a new section, its panel will be created in the next iteration's new row.
+            # else: panel for config1 is already in the row.
         
     logging.info(f"Finished building plot area. Total plot objects: {len(plot_ui_objects)}")
     return plot_ui_objects