updating money invested tab with other level of aggregation

app.py

@@ -406,28 +406,30 @@ with demo:
                 with gr.Column(scale=1):
                     interpretation = get_interpretation_text()
 
-        with gr.TabItem("💰 Money invested per trader"):
+        with gr.TabItem("💰 Money invested per trader type"):
             with gr.Row():
-                gr.Markdown("# Weekly total bet amount per trader for all traders")
+                gr.Markdown("# Weekly total bet amount per trader type for all markets")
             with gr.Row():
-                total_bet_amount = plot_total_bet_amount(trader_agents_data)
+                total_bet_amount = plot_total_bet_amount(
+                    trader_agents_data, market_filter="all"
+                )
 
             with gr.Row():
                 gr.Markdown(
-                    "# Weekly total bet amount per trader for traders Agents 🤖"
+                    "# Weekly total bet amount per trader type for Pearl markets"
                 )
             with gr.Row():
                 a_trader_total_bet_amount = plot_total_bet_amount(
-                    trader_agents_data, trader_filter="agent"
+                    trader_agents_data, market_filter="pearl"
                 )
 
             with gr.Row():
                 gr.Markdown(
-                    "# Weekly total bet amount per trader for Non-agent traders"
+                    "# Weekly total bet amount per trader type for Quickstart markets"
                 )
             with gr.Row():
                 na_trader_total_bet_amount = plot_total_bet_amount(
-                    trader_agents_data, trader_filter="non_agent"
+                    trader_agents_data, market_filter="quickstart"
                 )
         with gr.TabItem("💰 Money invested per market"):
             with gr.Row():

tabs/trader_plots.py

@@ -1,6 +1,7 @@
 import gradio as gr
 import pandas as pd
 import plotly.express as px
+from tabs.market_plots import color_mapping
 
 trader_metric_choices = [
     "mech calls",
@@ -176,7 +177,7 @@ def plot_winning_metric_per_trader(traders_winning_df: pd.DataFrame) -> gr.Plot:
 
 
 def plot_total_bet_amount(
-    trades_df: pd.DataFrame, trader_filter: str = "all"
+    trades_df: pd.DataFrame, market_filter: str = "all"
 ) -> gr.Plot:
     """Plots the trade metrics."""
     traders_all = trades_df.copy(deep=True)
@@ -190,37 +191,54 @@ def plot_total_bet_amount(
         lambda x: "non_agent" if x == "non_agent" else "agent"
     )
 
-    color_discrete_sequence = ["purple", "goldenrod", "darkgreen"]
-    if trader_filter == "agent":
-        color_discrete_sequence = ["darkviolet", "goldenrod", "green"]
-        final_traders = final_traders.loc[final_traders["trader_type"] == "agent"]
-    elif trader_filter == "non_agent":
-        final_traders = final_traders.loc[final_traders["trader_type"] != "agent"]
-
     total_bet_amount = (
         final_traders.groupby(
-            ["month_year_week", "market_creator", "trader_address"], sort=False
+            ["month_year_week", "market_creator", "trader_type"], sort=False
         )["collateral_amount"]
         .sum()
         .reset_index(name="total_bet_amount")
     )
-
-    fig = px.box(
+    total_bet_amount["trader_market"] = total_bet_amount.apply(
+        lambda x: (x["trader_type"], x["market_creator"]), axis=1
+    )
+    color_discrete_sequence = ["purple", "goldenrod", "darkgreen"]
+    if market_filter == "pearl":
+        color_discrete_sequence = ["darkviolet", "goldenrod", "green"]
+        total_bet_amount = total_bet_amount.loc[
+            total_bet_amount["market_creator"] == "pearl"
+        ]
+    elif market_filter == "quickstart":
+        total_bet_amount = total_bet_amount.loc[
+            total_bet_amount["market_creator"] == "quickstart"
+        ]
+    else:
+        total_bet_amount = total_bet_amount.loc[
+            total_bet_amount["market_creator"] == "all"
+        ]
+
+    fig = px.bar(
         total_bet_amount,
         x="month_year_week",
         y="total_bet_amount",
-        color="market_creator",
-        color_discrete_sequence=color_discrete_sequence,
+        color="trader_market",
+        color_discrete_sequence=color_mapping,
         category_orders={
             "market_creator": ["pearl", "quickstart", "all"],
+            "trader_market": [
+                ("agent", "pearl"),
+                ("non_agent", "pearl"),
+                ("agent", "quickstart"),
+                ("non_agent", "quickstart"),
+                ("agent", "all"),
+                ("non_agent", "all"),
+            ],
         },
-        # barmode="group",
-        # facet_col="market_creator",
+        barmode="group",
     )
-    fig.update_traces(boxmean=True)
+
     fig.update_layout(
         xaxis_title="Week",
-        yaxis_title="Weekly total bet amount",
+        yaxis_title="Weekly total bet amount per trader type",
         legend=dict(yanchor="top", y=0.5),
     )
     # for axis in fig.layout: