Upload app.py with huggingface_hub

app.py

@@ -2,87 +2,66 @@
 import gradio as gr
 import pandas as pd
 import matplotlib.pyplot as plt
-import matplotlib.ticker as ticker
-
-# Set font for CJK characters
-plt.rcParams['font.sans-serif'] = ['Noto Sans CJK SC', 'DejaVu Sans']
-plt.rcParams['axes.unicode_minus'] = False
 
 # Load the data
 df = pd.read_csv("data.csv")
 
-# Get unique entities and years for dropdowns and sliders
+# Get unique entities and years
 entities = sorted(df["Entity"].unique().tolist())
 earliest_year = int(df["Year"].min())
 latest_year = int(df["Year"].max())
 
-def plot_data(selected_entities, year_range, show_raw_data):
+def plot_data(selected_entities, start_year, end_year, show_raw_data):
     if not selected_entities:
-        return plt.figure(), pd.DataFrame()
-
-    min_year, max_year = year_range
+        return None, pd.DataFrame()
 
     filtered_df = df[df["Entity"].isin(selected_entities)].copy()
-    filtered_df = filtered_df[(filtered_df["Year"] >= min_year) & (filtered_df["Year"] <= max_year)]
+    filtered_df = filtered_df[(filtered_df["Year"] >= start_year) & (filtered_df["Year"] <= end_year)]
 
     # Create the plot
-    fig, ax = plt.subplots(figsize=(12, 7))
+    fig, ax = plt.subplots(figsize=(10, 6))
     for entity in selected_entities:
         entity_data = filtered_df[filtered_df["Entity"] == entity]
         if not entity_data.empty:
-            ax.plot(entity_data["Year"], entity_data["Percent"], label=entity, marker=".", markersize=8)
-
-    ax.set_xlabel("Year", fontsize=12)
-    ax.set_ylabel("Income Share (%)", fontsize=12)
-    ax.set_title("Top 5% Income Share Trend", fontsize=16, fontweight="bold")
-    ax.legend(title="Country/Region", bbox_to_anchor=(1.05, 1), loc="upper left")
-    ax.grid(True, linestyle=":", alpha=0.7)
-    ax.set_facecolor("#f5f5f5") # Light grey background
-
-    # Improve x-axis ticks
-    ax.xaxis.set_major_locator(ticker.MaxNLocator(integer=True))
-    plt.xticks(rotation=45, ha="right")
+            ax.plot(entity_data["Year"], entity_data["Percent"], label=entity, marker="o", markersize=4)
 
-    plt.tight_layout() # Adjust layout to prevent labels from overlapping
+    ax.set_xlabel("Year")
+    ax.set_ylabel("Income Share (%)")
+    ax.set_title("Top 5% Income Share Trend")
+    ax.legend(title="Country", bbox_to_anchor=(1.05, 1), loc="upper left")
+    ax.grid(True, linestyle="--", alpha=0.6)
+    plt.tight_layout()
 
-    # Return raw data if requested
     if show_raw_data:
         return fig, filtered_df
     else:
         return fig, pd.DataFrame()
 
 # Gradio Interface
-with gr.Blocks(theme=gr.themes.Soft()) as demo:
+with gr.Blocks() as demo:
     gr.Markdown("# 📊 Top 5% Income Share Visualization")
-    gr.Markdown("This interactive application visualizes the share of income received by the richest 5% of the population across different countries.")
-
+    
     with gr.Row():
-        with gr.Column(scale=1):
+        with gr.Column():
             entity_selector = gr.CheckboxGroup(
                 choices=entities,
-                label="Select Countries/Regions",
+                label="Select Countries",
                 value=["Australia", "China", "Germany", "Japan", "United States"]
             )
-            year_slider = gr.Slider(
-                minimum=earliest_year,
-                maximum=latest_year,
-                value=[earliest_year, latest_year],
-                step=1,
-                label="Select Year Range"
-            )
-            show_raw_data_checkbox = gr.Checkbox(label="Show Raw Data Table", value=False)
-            submit_button = gr.Button("🚀 Update Visualization", variant="primary")
-
-        with gr.Column(scale=2):
-            output_plot = gr.Plot(label="Income Share Trend")
-            output_dataframe = gr.DataFrame(label="Filtered Data Table")
+            with gr.Row():
+                start_year_input = gr.Number(value=earliest_year, label="Start Year", precision=0)
+                end_year_input = gr.Number(value=latest_year, label="End Year", precision=0)
+            
+            show_raw_data_checkbox = gr.Checkbox(label="Show Data Table", value=False)
+            submit_button = gr.Button("Update Chart", variant="primary")
 
-    gr.Markdown("---")
-    gr.Markdown("**Source:** [Our World in Data](https://ourworldindata.org/grapher/top-5-income-share)")
+        with gr.Column():
+            output_plot = gr.Plot()
+            output_dataframe = gr.DataFrame()
 
     submit_button.click(
         fn=plot_data,
-        inputs=[entity_selector, year_slider, show_raw_data_checkbox],
+        inputs=[entity_selector, start_year_input, end_year_input, show_raw_data_checkbox],
         outputs=[output_plot, output_dataframe]
     )