Update ui_generators.py

ui_generators.py

@@ -24,9 +24,9 @@ from config import (
 # 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"
+BOMB_ICON = "💣"
+EXPLORE_ICON = "🧭"
+FORMULA_ICON = "ƒ"
 ACTIVE_ICON = "❌ Close"
 
 
@@ -324,71 +324,110 @@ def run_follower_stats_tab_display(token_state):
 
 
 # --- UI GENERATION LOGIC FOR ANALYTICS TAB ---
-def create_analytics_plot_panel(label, plot_id_str):
+def create_analytics_plot_panel(plot_label_str, plot_id_str):
     """
-    Creates a Gradio Column representing a single plot panel.
-    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.
+    Creates an individual plot panel with its plot component and action buttons.
+    Returns the panel (Column), plot component, and button components.
     """
-    with gr.Column() as panel_col: 
-        with gr.Row(equal_height=False, variant="panel"): 
-            # The gr.Plot's label is what you're referring to.
-            # We will adjust spacing using Matplotlib's subplots_adjust in the plot generation functions.
-            plot_component = gr.Plot(label=label, scale=8) 
-            with gr.Column(scale=2, min_width=100): 
-                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
+    with gr.Column(visible=True) as panel_component: # Main container for this plot
+        with gr.Row(variant="compact"):
+            gr.Markdown(f"#### {plot_label_str}") # Plot title
+            with gr.Row(elem_classes="plot-actions", scale=0): # Action buttons container
+                # Ensure icons are defined (e.g., BOMB_ICON, EXPLORE_ICON, FORMULA_ICON)
+                # If not defined globally, pass them or use placeholders
+                bomb_button = gr.Button(value="💣", variant="tool", size="sm", min_width=30, elem_id=f"bomb_btn_{plot_id_str}")
+                formula_button = gr.Button(value="ƒ", variant="tool", size="sm", min_width=30, elem_id=f"formula_btn_{plot_id_str}")
+                explore_button = gr.Button(value="🧭", variant="tool", size="sm", min_width=30, elem_id=f"explore_btn_{plot_id_str}")
+        
+        # Placeholder for the actual plot - this will be updated by the analytics generation logic
+        plot_component = gr.Plot(label=plot_label_str, show_label=False) 
+        # Example of adding some specific styling or structure if needed
+        # gr.HTML(f"<div class='plot-container' id='plot_container_{plot_id_str}'></div>") # If you were embedding plots differently
+
+    logging.debug(f"Created analytics panel for: {plot_label_str} (ID: {plot_id_str})")
+    return panel_component, 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.
-    Returns a dictionary of plot UI objects.
+    
+    Returns a tuple:
+        - 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.")
     plot_ui_objects = {}
-
+    section_titles_map = {} # NEW: To store section title Markdown components
+    
     current_section_title = ""
+    
+    # Determine unique sections in order to correctly create Markdown components for them
+    # This ensures that section_titles_map will have keys for all sections defined in plot_configs
+    # and that they are created in the UI in the correct order.
+    
+    # First pass to create all section title Markdown objects and store them
+    # This is to ensure they are Gradio components that can be targeted for visibility updates.
+    # We use a temporary list to hold sections already processed to avoid duplicate Markdown objects for the same section.
+    processed_sections_for_md_creation = []
+    for config in plot_configs:
+        section_name = config["section"]
+        if section_name not in processed_sections_for_md_creation:
+            # Create the Markdown component for the section title
+            # The actual rendering order will be handled in the layout loop below
+            section_md_component = gr.Markdown(f"### {section_name}", visible=True) # Initially visible
+            section_titles_map[section_name] = section_md_component
+            processed_sections_for_md_creation.append(section_name)
+            logging.debug(f"Created Markdown component for section title: {section_name}")
+
+    # Layout loop: Iterate through plot_configs to place section titles and plot panels
     i = 0
+    last_rendered_section_title = None # Keep track of the last section title that was actually rendered
+    
     while i < len(plot_configs):
         config1 = plot_configs[i]
-
-        # Start a new section if necessary
-        if config1["section"] != current_section_title:
+        
+        # Render the section title if it's a new section and hasn't been rendered yet in this layout pass
+        if config1["section"] != last_rendered_section_title:
             current_section_title = config1["section"]
-            gr.Markdown(f"### {current_section_title}") 
+            
+            last_rendered_section_title = current_section_title
+            logging.info(f"Processing section: {current_section_title}")
 
-        with gr.Row(equal_height=False): 
+
+        # Create row for one or two plot panels
+        with gr.Row(equal_height=False):
             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_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,
+                "section": config1["section"] # Store section for easier lookup
             }
             logging.debug(f"Created UI panel for plot_id: {config1['id']}")
             i += 1
-
+            
             if i < len(plot_configs):
                 config2 = plot_configs[i]
+                # Check if the next plot is in the SAME section to place it in the same row
                 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
+                        "label": config2["label"], "panel_component": panel_col2,
+                        "section": config2["section"] # Store section
                     }
                     logging.debug(f"Created UI panel for plot_id: {config2['id']} in same row")
                     i += 1
-                
-    logging.info(f"Finished building plot area. Total plot objects: {len(plot_ui_objects)}")
+                # If config2 is in a different section, it will be handled by the next iteration of the outer loop
+                # which will then print its own section title.
+    
+    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):
         logging.error(f"MISMATCH: Expected {len(plot_configs)} plot objects, but created {len(plot_ui_objects)}.")
-    return plot_ui_objects
+    
+    # Return both the plot UI objects and the map of section title components
+    return plot_ui_objects, section_titles_map