updated daily metrics graphs

app.py

@@ -21,7 +21,7 @@ from tabs.trader_plots import (
 from tabs.daily_graphs import (
     get_current_week_data,
     plot_daily_metrics,
-    trade_daily_metric_choices,
+    trader_daily_metric_choices,
     default_daily_metric,
 )
 from scripts.utils import get_traders_family
@@ -242,7 +242,7 @@ with demo:
                 inputs=trader_na_details_selector,
                 outputs=na_trader_markets_plot,
             )
-        with gr.TabItem("📅 Daily metrics (WIP)"):
+        with gr.TabItem("📅 Daily metrics"):
             current_week_trades = get_current_week_data(trades_df=trader_agents_data)
             live_trades_current_week = get_current_week_data(trades_df=daily_info)
             if len(current_week_trades) > 0:
@@ -255,14 +255,13 @@ with demo:
             live_metrics_by_market_creator = compute_daily_metrics_by_market_creator(
                 live_trades_current_week, trader_filter=None, live_metrics=True
             )
-            print("live metrics dataframe")
-            print(live_metrics_by_market_creator.head())
+
             with gr.Row():
                 gr.Markdown("# Daily live metrics for all trades")
             with gr.Row():
                 trade_live_details_selector = gr.Dropdown(
                     label="Select a daily live metric",
-                    choices=trade_daily_metric_choices,
+                    choices=trader_daily_metric_choices,
                     value=default_daily_metric,
                 )
 
@@ -288,40 +287,107 @@ with demo:
             )
 
             with gr.Row():
-                gr.Markdown("# Daily profitability metrics available for all trades")
-            if len(current_week_trades) > 0:
-                with gr.Row():
-                    trader_daily_details_selector = gr.Dropdown(
-                        label="Select a daily trade metric",
-                        choices=trader_metric_choices,
-                        value=default_trader_metric,
+                gr.Markdown("# Daily live metrics for trader Agents 🤖")
+            with gr.Row():
+                a_trader_live_details_selector = gr.Dropdown(
+                    label="Select a daily live metric",
+                    choices=trader_daily_metric_choices,
+                    value=default_daily_metric,
+                )
+
+            with gr.Row():
+                with gr.Column(scale=3):
+                    a_trader_live_details_plot = plot_daily_metrics(
+                        metric_name=default_daily_metric,
+                        trades_df=live_metrics_by_market_creator,
+                        trader_filter="agent",
                     )
+                with gr.Column(scale=1):
+                    trade_details_text = get_metrics_text(daily=True)
+
+            def update_a_trader_live_details(trade_detail, a_trader_live_details_plot):
+                a_trader_plot = plot_daily_metrics(
+                    metric_name=trade_detail,
+                    trades_df=live_metrics_by_market_creator,
+                    trader_filter="agent",
+                )
+                return a_trader_plot
+
+            a_trader_live_details_selector.change(
+                update_a_trader_live_details,
+                inputs=[a_trader_live_details_selector, a_trader_live_details_plot],
+                outputs=[a_trader_live_details_plot],
+            )
+            with gr.Row():
+                gr.Markdown("# Daily live metrics for Non-agent traders")
+            with gr.Row():
+                na_trader_live_details_selector = gr.Dropdown(
+                    label="Select a daily live metric",
+                    choices=trader_daily_metric_choices,
+                    value=default_daily_metric,
+                )
 
-                with gr.Row():
-                    with gr.Column(scale=3):
-                        trader_daily_details_plot = plot_daily_metrics(
-                            metric_name=default_trader_metric,
-                            trades_df=daily_prof_metrics_by_market_creator,
-                        )
-                    with gr.Column(scale=1):
-                        trader_details_text = get_metrics_text(daily=True)
-
-                def update_trader_daily_details(
-                    trade_detail, trader_daily_details_plot
-                ):
-                    new_a_plot = plot_daily_metrics(
-                        metric_name=trade_detail,
-                        trades_df=daily_prof_metrics_by_market_creator,
+            with gr.Row():
+                with gr.Column(scale=3):
+                    na_trader_live_details_plot = plot_daily_metrics(
+                        metric_name=default_daily_metric,
+                        trades_df=live_metrics_by_market_creator,
+                        trader_filter="non_agent",
                     )
-                    return new_a_plot
+                with gr.Column(scale=1):
+                    trade_details_text = get_metrics_text(daily=True)
 
-                trader_daily_details_selector.change(
-                    update_trader_daily_details,
-                    inputs=[trader_daily_details_selector, trader_daily_details_plot],
-                    outputs=[trader_daily_details_plot],
+            def update_na_trader_live_details(
+                trade_detail, na_trader_live_details_plot
+            ):
+                na_trader_plot = plot_daily_metrics(
+                    metric_name=trade_detail,
+                    trades_df=live_metrics_by_market_creator,
+                    trader_filter="non_agent",
                 )
-            else:
-                gr.Markdown("Data not available yet")
+                return na_trader_plot
+
+            na_trader_live_details_selector.change(
+                update_na_trader_live_details,
+                inputs=[na_trader_live_details_selector, na_trader_live_details_plot],
+                outputs=[na_trader_live_details_plot],
+            )
+
+            # with gr.Row():
+            #     gr.Markdown("# Daily profitability metrics available for all trades")
+            # if len(current_week_trades) > 0:
+            #     with gr.Row():
+            #         trader_daily_details_selector = gr.Dropdown(
+            #             label="Select a daily trade metric",
+            #             choices=trader_metric_choices,
+            #             value=default_trader_metric,
+            #         )
+
+            #     with gr.Row():
+            #         with gr.Column(scale=3):
+            #             trader_daily_details_plot = plot_daily_metrics(
+            #                 metric_name=default_trader_metric,
+            #                 trades_df=daily_prof_metrics_by_market_creator,
+            #             )
+            #         with gr.Column(scale=1):
+            #             trader_details_text = get_metrics_text(daily=True)
+
+            #     def update_trader_daily_details(
+            #         trade_detail, trader_daily_details_plot
+            #     ):
+            #         new_a_plot = plot_daily_metrics(
+            #             metric_name=trade_detail,
+            #             trades_df=daily_prof_metrics_by_market_creator,
+            #         )
+            #         return new_a_plot
+
+            #     trader_daily_details_selector.change(
+            #         update_trader_daily_details,
+            #         inputs=[trader_daily_details_selector, trader_daily_details_plot],
+            #         outputs=[trader_daily_details_plot],
+            #     )
+            # else:
+            #     gr.Markdown("Data not available yet")
 
         with gr.TabItem("📉Closed Markets Kullback–Leibler divergence"):
             with gr.Row():

tabs/daily_graphs.py

@@ -7,7 +7,7 @@ import plotly.graph_objects as go
 from datetime import datetime, timedelta
 from tqdm import tqdm
 
-trade_daily_metric_choices = ["mech calls", "collateral amount", "nr_trades"]
+trader_daily_metric_choices = ["mech calls", "collateral amount", "nr_trades"]
 default_daily_metric = "collateral amount"
 color_mapping = [
     "darkviolet",
@@ -105,7 +105,9 @@ def plot_daily_metrics(
         column_name = metric_name
         yaxis_title = "Total gross profit per trader (xDAI)"
 
+    color_discrete_sequence = ["purple", "goldenrod", "darkgreen"]
     if trader_filter == "agent":
+        color_discrete_sequence = ["darkviolet", "goldenrod", "green"]
         trades_filtered = trades_df.loc[trades_df["staking"] != "non_agent"]
     elif trader_filter == "non_agent":
         trades_filtered = trades_df.loc[trades_df["staking"] == "non_agent"]
@@ -123,8 +125,8 @@ def plot_daily_metrics(
         trades_filtered,
         x="creation_date",
         y=column_name,
-        color="trader_market",
-        color_discrete_sequence=color_mapping,
+        color="market_creator",
+        color_discrete_sequence=color_discrete_sequence,
         category_orders={
             "market_creator": ["pearl", "quickstart", "all"],
             "trader_market": [
@@ -136,7 +138,7 @@ def plot_daily_metrics(
                 ("non_agent", "all"),
             ],
         },
-        facet_col="market_creator",
+        # facet_col="market_creator",
     )
     fig.update_traces(boxmean=True)
     fig.update_layout(
@@ -144,9 +146,9 @@ def plot_daily_metrics(
         yaxis_title=yaxis_title,
         legend=dict(yanchor="top", y=0.5),
     )
-    for axis in fig.layout:
-        if axis.startswith("xaxis"):
-            fig.layout[axis].update(title="Day")
+    # for axis in fig.layout:
+    #     if axis.startswith("xaxis"):
+    #         fig.layout[axis].update(title="Day")
     fig.update_xaxes(tickformat="%b %d")
     return gr.Plot(
         value=fig,