add weekly stats

app.py

@@ -140,6 +140,21 @@ def full_report():
                    template="plotly_dark")
     total.update_layout(showlegend=False)
 
+    country_df_to_plot_weekly = df[df['day'] >= df['day'].max() - 7].groupby(['country', 'iso']).sum().reset_index()
+    country_df_to_plot_weekly = country_df_to_plot_weekly.sort_values(by=['jumps'], ascending=False)
+    top_5_weekly = country_df_to_plot_weekly.iloc[:10]['country'].tolist()
+    country_df_to_plot_weekly = country_df_to_plot_weekly[country_df_to_plot_weekly['country'].isin(top_5_weekly)].reset_index(drop=True)
+    country_df_to_plot_weekly = country_df_to_plot_weekly.sort_values(by=['jumps'], ascending=True)
+    total_weekly = px.bar(country_df_to_plot_weekly, 
+                   y='country', x='jumps', 
+                   color='country',
+                   title='Top Countries This Week', 
+                   orientation='h',
+                   category_orders={'country': top_5_weekly},
+                   height=500,
+                   template="plotly_dark")
+    total_weekly.update_layout(showlegend=False)
+
     city_df = df.groupby(['city', 'iso']).sum().reset_index()
     city_df = city_df.sort_values(by=['jumps'], ascending=False)
     city_df['city'] = city_df.apply(lambda row: row['city'] + ', ' + row['iso'], axis=1)
@@ -182,8 +197,25 @@ def full_report():
                  height=800,
                  template="plotly_dark")
     
+    city_df_weekly = df[df['day'] >= df['day'].max() - 7].groupby(['city', 'iso']).sum().reset_index()
+    city_df_weekly = city_df_weekly[city_df_weekly['city'] != '(not set)']
+    city_df_weekly['city'] = city_df_weekly.apply(lambda row: row['city'] + ', ' + row['iso'], axis=1)
+    city_df_weekly = city_df_weekly.sort_values(by=['jumps'], ascending=False)
+    top_5_weekly = city_df_weekly.iloc[:10]['city'].tolist()
+    city_df_weekly = city_df_weekly[city_df_weekly['city'].isin(top_5_weekly)].reset_index(drop=True)
+    city_df_weekly = city_df_weekly.sort_values(by=['jumps'], ascending=True)
+    avg_weekly = px.bar(city_df_weekly, 
+                 y='city', x='jumps', color='city',
+                 title='Top Cities This Week', 
+                 orientation='h',
+                 category_orders={'city': top_5_weekly},
+                 height=500,
+                 template="plotly_dark")
+    
     avg.update_layout(showlegend=False)
     avg.update(layout_coloraxis_showscale=False)
+    avg_weekly.update_layout(showlegend=False)
+    avg_weekly.update(layout_coloraxis_showscale=False)
 
     country_df['rank'] = country_df['jumps'].rank(ascending=False)
     total_map = px.choropleth(country_df, locations="iso",
@@ -238,7 +270,8 @@ def full_report():
                               trendline_scope='overall',
                               template="plotly_dark")
 
-    return f"# {total_jumps:,} total jumps in {unique_cities:,} cities across {unique_countries:,} countries", total, avg, total_map, icicle, jumps_over_time, county_map, per_day_plot
+    return f"# {total_jumps:,} total jumps in {unique_cities:,} cities across {unique_countries:,} countries", \
+           total, total_weekly, avg, avg_weekly, total_map, icicle, jumps_over_time, county_map, per_day_plot
 
 
 with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
@@ -249,9 +282,13 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
     with gr.Row():
         jumps_over_time = gr.Plot(label="Jumps Over Time")
     with gr.Row():
-        total_plot = gr.Plot(label="Top 10 Countries")
+        total_plot = gr.Plot(label="Top Countries (All Time)")
+    with gr.Row():
+        total_plot_weekly = gr.Plot(label="Top Countries (This Week)")
+    with gr.Row():
+        avg_plot = gr.Plot(label="Top Cities (All Time)")
     with gr.Row():
-        avg_plot = gr.Plot(label="Top 10 Cities")
+        avg_plot_weekly = gr.Plot(label="Top Cities (This Week)")
     with gr.Row():
         icicle_fig = gr.Plot(label="Treemap")
     with gr.Row():
@@ -259,7 +296,7 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
     with gr.Row():
         county_map = gr.Plot(label="US Map")
 
-    outputs = [total_jumps_label, total_plot, avg_plot, map_fig, icicle_fig, jumps_over_time, county_map, per_day_plot]
+    outputs = [total_jumps_label, total_plot, total_plot_weekly, avg_plot, avg_plot_weekly, map_fig, icicle_fig, jumps_over_time, county_map, per_day_plot]
     dep = demo.load(full_report, None, outputs)
 
 if __name__ == "__main__":