Update ui_generators.py

ui_generators.py

@@ -308,51 +308,74 @@ def run_follower_stats_tab_display(token_state):
 
 
 # --- NEW UI GENERATION LOGIC FOR ANALYTICS TAB ---
-def create_analytics_plot_ui_row(label, plot_id_str):
+def create_analytics_plot_panel(label, plot_id_str):
     """
-    Creates a Gradio Row with a Plot component, a Bomb (insights) button,
-    and a hidden Column for insights.
+    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 function will be called within a gr.Blocks() context in app.py
-    with gr.Row(equal_height=False): 
-        with gr.Column(scale=7): # Main column for the plot
-            plot_component = gr.Plot(label=label)
-        with gr.Column(scale=1, min_width=60): # Smaller column for the bomb button
-            bomb_button = gr.Button("💣", variant="secondary", size="sm", elem_id=f"bomb_{plot_id_str}")
-        # Insights column, initially hidden, appears to the right
-        with gr.Column(scale=4, visible=False, elem_id=f"insights_col_{plot_id_str}") as insights_col_ui:
-            gr.Markdown(f"##### Insights: {label}") # Title for the insights panel
-            insights_markdown_ui = gr.Markdown(f"Click 💣 for insights on {label}...") # Placeholder text
-    return plot_component, bomb_button, insights_col_ui, insights_markdown_ui
-
-def build_analytics_tab_ui_components(plot_configs):
+    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, vertical_alignment="center"): # min_width for button, try to center vertically
+                bomb_button = gr.Button("💣", variant="secondary", size="sm", elem_id=f"bomb_{plot_id_str}")
+    return panel_col, plot_component, bomb_button
+
+def build_analytics_tab_plot_area(plot_configs):
     """
-    Builds and returns all UI components for the analytics plots based on plot_configs.
-    This function should be called within the "Analytics" TabItem context in app.py.
-    It will create the section headers and the plot rows.
+    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 UI components for {len(plot_configs)} analytics plots.")
-    plot_ui_objects = {} # Stores {"plot_id": {"plot": gr.Plot, "bomb": gr.Button, "insights_col": gr.Column, "insights_md": gr.Markdown, "label": str}}
+    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}}
     
     current_section_title = ""
-    for config in plot_configs:
-        if config["section"] != current_section_title:
-            gr.Markdown(f"### {config['section']}") # Create section header
-            current_section_title = config["section"]
-        
-        # Create the plot row using the helper
-        plot_component, bomb_button, insights_col_ui, insights_markdown_ui = \
-            create_analytics_plot_ui_row(config["label"], config["id"])
-        
-        # Store the created components in the dictionary
-        plot_ui_objects[config["id"]] = {
-            "plot": plot_component,
-            "bomb": bomb_button,
-            "insights_col": insights_col_ui,
-            "insights_md": insights_markdown_ui,
-            "label": config["label"] # Store label for easy access, e.g., for insights text
-        }
-        logging.debug(f"Created UI for plot_id: {config['id']} in section: {config['section']}")
+    
+    # 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
+        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
+            # First plot in the pair
+            config1 = plot_configs[i]
+            panel_col1, plot_component1, bomb_button1 = \
+                create_analytics_plot_panel(config1["label"], config1["id"])
+            plot_ui_objects[config1["id"]] = {
+                "plot_component": plot_component1,
+                "bomb_button": bomb_button1,
+                "label": config1["label"]
+            }
+            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
         
-    logging.info(f"Finished building UI components for analytics tab. Total objects: {len(plot_ui_objects)}")
+    logging.info(f"Finished building plot area. Total plot objects: {len(plot_ui_objects)}")
     return plot_ui_objects