updating graphs for trades version 1 and version 2

app.py

@@ -15,6 +15,8 @@ from tabs.trades import (
     plot_trades_per_market_by_week,
     plot_winning_trades_by_week,
     plot_winning_trades_per_market_by_week,
+    integrated_plot_trades_per_market_by_week,
+    integrated_plot_winning_trades_per_market_by_week,
 )
 
 from tabs.metrics import (
@@ -23,6 +25,8 @@ from tabs.metrics import (
     plot_trade_details,
     plot2_trade_details,
     plot_trade_metrics,
+    WIDTH,
+    HEIGHT,
 )
 
 from tabs.tool_win import (
@@ -189,7 +193,7 @@ with demo:
     )
 
     with gr.Tabs():
-        with gr.TabItem("🔥Trades Dashboard"):
+        with gr.TabItem("🔥Trades Dashboard v1"):
             with gr.Row():
                 gr.Markdown("# Trend of weekly trades")
             with gr.Row():
@@ -250,6 +254,56 @@ with demo:
             with gr.Row():
                 trade_details_plot
 
+        with gr.TabItem("🔥Trades Dashboard v2"):
+            with gr.Row():
+                gr.Markdown("# Trend of weekly trades")
+            with gr.Row():
+                trades_by_week = integrated_plot_trades_per_market_by_week(
+                    trades_df=trades_df
+                )
+
+            with gr.Row():
+                gr.Markdown("# Percentage of winning trades per week")
+            with gr.Row():
+                all_wtrades_by_week = integrated_plot_winning_trades_per_market_by_week(
+                    trades_df=trades_df
+                )
+
+            with gr.Row():
+                gr.Markdown("# ⚖️ Trading metrics")
+            with gr.Row():
+                trade_details_selector = gr.Dropdown(
+                    label="Select a trade metric",
+                    choices=metric_choices,
+                    value=default_metric,
+                )
+            with gr.Row():
+                trade_details_plot = plot_trade_metrics(
+                    metric_name=default_metric,
+                    trades_df=trades_df,
+                    height=400,
+                    width=1400,
+                )
+
+            def update_trade_details(trade_detail):
+                return plot_trade_metrics(
+                    metric_name=trade_detail,
+                    trades_df=trades_df,
+                    height=400,
+                    width=1400,
+                )
+
+            trade_details_selector.change(
+                update_trade_details,
+                inputs=trade_details_selector,
+                outputs=trade_details_plot,
+            )
+
+            with gr.Row():
+                trade_details_selector
+            with gr.Row():
+                trade_details_plot
+
         with gr.TabItem("🚀 Tool Winning Dashboard"):
             with gr.Row():
                 gr.Markdown("# All tools winning performance")

tabs/metrics.py

@@ -153,7 +153,9 @@ def plot2_trade_details(
     )
 
 
-def plot_trade_metrics(metric_name: str, trades_df: pd.DataFrame) -> gr.Plot:
+def plot_trade_metrics(
+    metric_name: str, trades_df: pd.DataFrame, height: int = None, width: int = None
+) -> gr.Plot:
     """Plots the trade metrics."""
 
     if metric_name == "mech calls":
@@ -190,6 +192,8 @@ def plot_trade_metrics(metric_name: str, trades_df: pd.DataFrame) -> gr.Plot:
         legend=dict(yanchor="top", y=0.5),
     )
     fig.update_xaxes(tickformat="%b %d\n%Y")
+    if height is not None:
+        fig.update_layout(width=WIDTH, height=HEIGHT)
     return gr.Plot(
         value=fig,
     )

tabs/trades.py

@@ -3,8 +3,8 @@ import pandas as pd
 import plotly.express as px
 
 
-HEIGHT = 600
-WIDTH = 1000
+HEIGHT = 400
+WIDTH = 1200
 
 
 def prepare_trades(trades_df: pd.DataFrame) -> pd.DataFrame:
@@ -119,7 +119,6 @@ def plot_trades_per_market_by_week(
     fig.update_layout(
         xaxis_title="Week",
         yaxis_title="Weekly nr of trades",
-        # xaxis_type="category",
     )
     fig.update_xaxes(tickformat="%b %d\n%Y")
     return gr.Plot(
@@ -127,6 +126,70 @@ def plot_trades_per_market_by_week(
     )
 
 
+def integrated_plot_trades_per_market_by_week(trades_df: pd.DataFrame) -> gr.Plot:
+
+    # adding the total
+    trades_all = trades_df.copy(deep=True)
+    trades_all["market_creator"] = "all"
+
+    # merging both dataframes
+    all_filtered_trades = pd.concat([trades_df, trades_all], ignore_index=True)
+    all_filtered_trades = all_filtered_trades.sort_values(
+        by="creation_timestamp", ascending=True
+    )
+
+    trades = get_overall_by_market_trades(all_filtered_trades)
+    fig = px.bar(
+        trades,
+        x="month_year_week",
+        y="trades",
+        color="market_creator",
+        barmode="group",
+        color_discrete_sequence=["goldenrod", "darkgreen", "purple"],
+    )
+    fig.update_layout(
+        xaxis_title="Week",
+        yaxis_title="Weekly nr of trades",
+        legend=dict(yanchor="top", y=0.5),
+    )
+    fig.update_layout(width=WIDTH, height=HEIGHT)
+    fig.update_xaxes(tickformat="%b %d\n%Y")
+    return gr.Plot(value=fig)
+
+
+def integrated_plot_winning_trades_per_market_by_week(
+    trades_df: pd.DataFrame,
+) -> gr.Plot:
+    # adding the total
+    trades_all = trades_df.copy(deep=True)
+    trades_all["market_creator"] = "all"
+
+    # merging both dataframes
+    all_filtered_trades = pd.concat([trades_df, trades_all], ignore_index=True)
+    all_filtered_trades = all_filtered_trades.sort_values(
+        by="creation_timestamp", ascending=True
+    )
+    final_df = get_overall_winning_by_market_trades(all_filtered_trades)
+    fig = px.bar(
+        final_df,
+        x="month_year_week",
+        y="winning_trade",
+        color="market_creator",
+        barmode="group",
+        color_discrete_sequence=["goldenrod", "darkgreen", "purple"],
+    )
+    fig.update_layout(
+        xaxis_title="Week",
+        yaxis_title="Weekly % of winning trades",
+        legend=dict(yanchor="top", y=0.5),
+    )
+    fig.update_layout(width=WIDTH, height=HEIGHT)
+    fig.update_xaxes(tickformat="%b %d\n%Y")
+    return gr.Plot(
+        value=fig,
+    )
+
+
 def plot_winning_trades_by_week(trades_df: pd.DataFrame) -> gr.BarPlot:
     """Plots the winning trades data for the given tools and calculates the winning percentage."""
     return gr.BarPlot(
@@ -168,7 +231,6 @@ def plot_winning_trades_per_market_by_week(
     fig.update_layout(
         xaxis_title="Week",
         yaxis_title="Weekly % of winning trades",
-        # xaxis_type="category",
     )
     fig.update_xaxes(tickformat="%b %d\n%Y")
     return gr.Plot(