Update analytics_plot_generator.py

analytics_plot_generator.py

@@ -16,7 +16,7 @@ def create_placeholder_plot(title="No Data or Plot Error", message="Data might b
         fig, ax = plt.subplots(figsize=(8, 4))
         ax.text(0.5, 0.5, f"{title}\n{message}", ha='center', va='center', fontsize=10, wrap=True)
         ax.axis('off')
-        plt.tight_layout()
+        fig.tight_layout() # MODIFIED
         # Add spacing for consistency, though it might be less critical for placeholders
         fig.subplots_adjust(top=0.90)
         return fig
@@ -26,6 +26,7 @@ def create_placeholder_plot(title="No Data or Plot Error", message="Data might b
         fig_err, ax_err = plt.subplots()
         ax_err.text(0.5, 0.5, "Fatal: Plot generation error", ha='center', va='center')
         ax_err.axis('off')
+        fig_err.tight_layout() # MODIFIED
         fig_err.subplots_adjust(top=0.90)
         return fig_err
     # No plt.close(fig) here as Gradio handles the figure object.
@@ -64,7 +65,7 @@ def generate_posts_activity_plot(df, date_column='published_at'):
         ax.set_ylabel('Number of Posts')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info("Successfully generated posts activity plot.")
         return fig
@@ -73,10 +74,7 @@ def generate_posts_activity_plot(df, date_column='published_at'):
         if fig: plt.close(fig) # Close if fig was created before error
         return create_placeholder_plot(title="Posts Activity Error", message=str(e))
     finally:
-        # If fig was not returned (e.g. placeholder was returned), and it exists, close it.
-        # However, if fig is returned, Gradio handles it.
-        # The plt.close('all') was too broad. We only close specific figures if not returned.
-        pass # Let Gradio handle the returned figure. If a placeholder is returned, its figure is handled there.
+        pass
 
 
 def generate_engagement_type_plot(df, likes_col='likeCount', comments_col='commentCount', shares_col='shareCount'):
@@ -125,7 +123,7 @@ def generate_engagement_type_plot(df, likes_col='likeCount', comments_col='comme
             yval = bar.get_height()
             ax.text(bar.get_x() + bar.get_width()/2.0, yval + (0.01 * max(engagement_data.values(), default=10)), str(int(yval)), ha='center', va='bottom')
 
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info("Successfully generated engagement type plot.")
         return fig
@@ -170,7 +168,7 @@ def generate_mentions_activity_plot(df, date_column='date'):
         ax.set_ylabel('Number of Mentions')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info("Successfully generated mentions activity plot.")
         return fig
@@ -207,7 +205,7 @@ def generate_mention_sentiment_plot(df, sentiment_column='sentiment_label'):
         ax.pie(sentiment_counts, labels=sentiment_counts.index, autopct='%1.1f%%', startangle=90, colors=pie_colors)
         ax.set_title('Mention Sentiment Distribution', y=1.03) # Matplotlib title
         ax.axis('equal')
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info("Successfully generated mention sentiment plot.")
         return fig
@@ -261,7 +259,7 @@ def generate_followers_count_over_time_plot(df, date_info_column='category_name'
         ax.legend()
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -327,7 +325,7 @@ def generate_followers_growth_rate_plot(df, date_info_column='category_name',
         ax.legend()
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -400,7 +398,7 @@ def generate_followers_by_demographics_plot(df, category_col='category_name',
                     ax.text(bar_item.get_x() + bar_item.get_width()/2.0, yval + (0.01 * ax.get_ylim()[1]),
                             str(int(yval)), ha='center', va='bottom', fontsize=8)
 
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.85) # Adjust top for more space, especially with rotated labels
         return fig
     except Exception as e:
@@ -453,7 +451,7 @@ def generate_engagement_rate_over_time_plot(df, date_column='published_at', enga
         ax.yaxis.set_major_formatter(mticker.PercentFormatter(xmax=formatter_xmax))
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -494,7 +492,7 @@ def generate_reach_over_time_plot(df, date_column='published_at', reach_col='cli
         ax.set_ylabel('Total Clicks') # Label consistent with reach_col='clickCount'
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -535,7 +533,7 @@ def generate_impressions_over_time_plot(df, date_column='published_at', impressi
         ax.set_ylabel('Total Impressions')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -571,7 +569,7 @@ def generate_likes_over_time_plot(df, date_column='published_at', likes_col='lik
         ax.set_ylabel('Total Likes')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -585,7 +583,7 @@ def generate_clicks_over_time_plot(df, date_column='published_at', clicks_col='c
     title = "Clicks Over Time"
     logging.info(f"Generating {title}. Date: '{date_column}', Clicks Col: '{clicks_col}'. DF rows: {len(df) if df is not None else 'None'}")
     # This function essentially calls generate_reach_over_time_plot with specific params
-    # The fig.subplots_adjust will be handled within that function.
+    # The fig.tight_layout() and fig.subplots_adjust will be handled within that function.
     return generate_reach_over_time_plot(df, date_column, clicks_col)
 
 
@@ -615,7 +613,7 @@ def generate_shares_over_time_plot(df, date_column='published_at', shares_col='s
         ax.set_ylabel('Total Shares')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -651,7 +649,7 @@ def generate_comments_over_time_plot(df, date_column='published_at', comments_co
         ax.set_ylabel('Total Comments')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -692,7 +690,7 @@ def generate_comments_sentiment_breakdown_plot(df, sentiment_column='comment_sen
         ax.pie(sentiment_counts, labels=sentiment_counts.index, autopct='%1.1f%%', startangle=90, colors=pie_colors)
         ax.set_title(title, y=1.03) # Matplotlib title
         ax.axis('equal')
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         return fig
     except Exception as e:
@@ -733,7 +731,7 @@ def generate_post_frequency_plot(df, date_column='published_at', resample_period
         ax.set_ylabel('Number of Posts')
         ax.grid(True, linestyle='--', alpha=0.7)
         plt.xticks(rotation=45)
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info(f"Successfully generated {title} plot.")
         return fig
@@ -772,7 +770,7 @@ def generate_content_format_breakdown_plot(df, format_col='media_type'):
         for i, v in enumerate(format_counts):
             ax.text(i, v + (0.01 * format_counts.max()), str(v), ha='center', va='bottom')
 
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info(f"Successfully generated {title} plot.")
         return fig
@@ -832,7 +830,7 @@ def generate_content_topic_breakdown_plot(df, topics_col='eb_labels', top_n=15):
         for i, (topic, count) in enumerate(top_topics.items()):
             ax.text(count + (0.01 * top_topics.max()), i, str(count), va='center')
 
-        plt.tight_layout(fig=fig)
+        fig.tight_layout() # MODIFIED
         fig.subplots_adjust(top=0.88) # Add space for Gradio label
         logging.info(f"Successfully generated {title} plot.")
         return fig