fix: running weekly avg

app.py

@@ -60,13 +60,11 @@ def fetch_and_aggregate_transactions():
         for service_id in range(1, total_services + 1):
             service = service_registry.functions.getService(service_id).call()
             agent_ids = service[-1]
-            print('--------DEBUG 1-------', service_id)
             if 40 in agent_ids or 25 in agent_ids:
                 agent_instance_data = service_registry.functions.getAgentInstances(service_id).call()
                 agent_addresses = agent_instance_data[1]
                 if agent_addresses:
                     agent_address = agent_addresses[0]
-                    print('--------DEBUG 2-------', service_id, agent_address)
                 response_transfers = get_transfers("valory", agent_address)
                 transfers = response_transfers.get("transfers", [])
                 
@@ -304,15 +302,20 @@ def create_visualizations():
 
     daily_agents_df = df_agents.groupby('date').agg({'agent_count': 'sum'}).reset_index()
     daily_agents_df.rename(columns={'agent_count': 'daily_agent_count'}, inplace=True)
-    weekly_agents_df = df_agents.groupby('week').agg({'agent_count': 'sum'}).reset_index()
-    weekly_agents_df.rename(columns={'agent_count': 'weekly_agent_count'}, inplace=True)
-
-    merged_df = pd.merge(daily_agents_df, df_agents[['date', 'week']], on='date', how='left')
-    weekly_merged_df = pd.merge(merged_df, weekly_agents_df, on='week', how='left')
+    # Sort by date to ensure proper running total calculation
+    daily_agents_df = daily_agents_df.sort_values('date')
+    
+    # Create week column
+    daily_agents_df['week'] = daily_agents_df['date'].dt.to_period('W').apply(lambda r: r.start_time)
+    
+    # Calculate running total within each week
+    daily_agents_df['running_weekly_total'] = daily_agents_df.groupby('week')['daily_agent_count'].cumsum()
     
+    # Create final merged dataframe
+    weekly_merged_df = daily_agents_df.copy()
     adjustment_date = pd.to_datetime('2024-11-15')
     weekly_merged_df.loc[weekly_merged_df['date'] == adjustment_date, 'daily_agent_count'] -= 1
-    weekly_merged_df.loc[weekly_merged_df['date'] == adjustment_date, 'weekly_agent_count'] -= 1
+    weekly_merged_df.loc[weekly_merged_df['date'] == adjustment_date, 'running_weekly_total'] -= 1
     fig_agents_registered = go.Figure(data=[
         go.Bar(
             name='Daily nr of Registered Agents',
@@ -324,7 +327,7 @@ def create_visualizations():
         go.Bar(
             name='Weekly Nr of Registered Agents',
             x=weekly_merged_df['date'],
-            y=weekly_merged_df['weekly_agent_count'],
+            y=weekly_merged_df['running_weekly_total'],
             opacity=0.7,
             marker_color='purple'
         )