Update ui_generators.py

ui_generators.py

@@ -325,33 +325,34 @@ def run_follower_stats_tab_display(token_state):
 def create_analytics_plot_panel(plot_label_str, plot_id_str):
     """
     Creates an individual plot panel with its plot component and action buttons.
-    This version matches the original structure provided by the user.
+    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.
-    # For consistency with app.py, let's assume they are globally accessible or correctly imported.
-    # If not, replace "BOMB_ICON", "EXPLORE_ICON", "FORMULA_ICON" with their actual string values like "�".
-    # This function will use string literals for icons if not found in global scope,
-    # but it's better practice to ensure they are consistently defined.
     try:
-        from config import BOMB_ICON, EXPLORE_ICON, FORMULA_ICON # Try to import if they are in config
+        # 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, using defaults.")
+        logging.warning("Icons BOMB_ICON, EXPLORE_ICON, FORMULA_ICON not found in config for ui_generators, using defaults.")
         BOMB_ICON = "💣"
         EXPLORE_ICON = "🧭"
         FORMULA_ICON = "ƒ"
 
+    with gr.Column(visible=True) as panel_component: # Main container for this plot
+        with gr.Row(variant="compact", vertical_align="center"): # Ensure vertical alignment for title and buttons
+            gr.Markdown(f"#### {plot_label_str}", scale=3) # Plot title, give it more space
+            with gr.Row(elem_classes="plot-actions", scale=1, min_width=120): # Action buttons container, adjust scale/min_width as needed
+                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}")
+        
+        plot_component = gr.Plot(label=plot_label_str, show_label=False) # Label is shown in Markdown above
 
-    with gr.Column() as panel_col: 
-        with gr.Row(equal_height=False, variant="panel"): 
-            plot_component = gr.Plot(label=plot_label_str, scale=8, show_label=True) # Ensure plot label is shown
-            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}")
-    logging.debug(f"Created analytics panel for: {plot_label_str} (ID: {plot_id_str}) using original structure.")
-    return panel_col, plot_component, bomb_button, explore_button, formula_button
+    logging.debug(f"Created analytics panel (styled) 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):
@@ -363,56 +364,44 @@ 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.")
+    logging.info(f"Building plot area for {len(plot_configs)} analytics plots with interleaved section titles and styled panels.")
     plot_ui_objects = {}
     section_titles_map = {} 
     
-    last_rendered_section = None # Keep track of the last section title rendered
+    last_rendered_section = None 
     
     idx = 0
     while idx < len(plot_configs):
         current_plot_config = plot_configs[idx]
         current_section_name = current_plot_config["section"]
         
-        # If this plot belongs to a new section, display the section title
         if current_section_name != last_rendered_section:
             if current_section_name not in section_titles_map:
-                # Create the Markdown component for this section title if it doesn't exist
-                # This call to gr.Markdown() places it in the current layout flow.
                 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:
-                # If it exists, it means this section might have appeared before (e.g., non-contiguous sections in plot_configs)
-                # We need to ensure this existing component is "placed" again in the layout.
-                # In Gradio, re-referencing the component variable usually does this.
-                # This line might be needed if section_titles_map[current_section_name] was defined in a way that its
-                # previous rendering doesn't automatically carry to this new layout position.
-                # However, since we are iterating and creating if not exists, this branch might be less common
-                # if plot_configs are typically ordered by section.
-                # For safety, ensure it's visible.
-                section_titles_map[current_section_name].visible = True # Ensure it's visible
-                # section_titles_map[current_section_name] # Re-introduce to layout - often implicit
-                logging.debug(f"Re-using Markdown for section: {current_section_name}")
-
+                # 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}")
             last_rendered_section = current_section_name
 
-        # Create a new row for the plot(s)
-        with gr.Row(equal_height=False):
+        with gr.Row(equal_height=False): # Row for one or two plots
             # --- Process the first plot in the row (config1) ---
             config1 = plot_configs[idx]
-            # Ensure it's from the current section we just titled (should be, due to loop structure)
+            # Safety check, though current_section_name should match config1["section"] here
             if config1["section"] != current_section_name:
-                # This case should ideally not happen if logic is correct, means we might have skipped a section title
-                logging.warning(f"Plot {config1['id']} is in section {config1['section']} but current rendered section is {current_section_name}. Layout might be off.")
-                # Force rendering the correct section title if missed
-                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"] # Update tracker
+                 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"]
+
 
             panel_col1, plot_comp1, bomb_btn1, explore_btn1, formula_btn1 = \
-                create_analytics_plot_panel(config1["label"], config1["id"])
+                create_analytics_plot_panel(config1["label"], config1["id"]) # Use the styled panel creator
             plot_ui_objects[config1["id"]] = {
                 "plot_component": plot_comp1, "bomb_button": bomb_btn1,
                 "explore_button": explore_btn1, "formula_button": formula_btn1,
@@ -425,10 +414,9 @@ 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]
-                # Check if the next plot is in the SAME section to place it in the same row
-                if config2["section"] == current_section_name:
+                if config2["section"] == current_section_name: # Must be in the same section for the same row
                     panel_col2, plot_comp2, bomb_btn2, explore_btn2, formula_btn2 = \
-                        create_analytics_plot_panel(config2["label"], config2["id"])
+                        create_analytics_plot_panel(config2["label"], config2["id"]) # Use the styled panel creator
                     plot_ui_objects[config2["id"]] = {
                         "plot_component": plot_comp2, "bomb_button": bomb_btn2,
                         "explore_button": explore_btn2, "formula_button": formula_btn2,
@@ -437,8 +425,6 @@ 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 config2 is in a different section, the outer while loop will handle its title
-                # before creating its panel in a new 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):