updated gradio version and trades market tab

README.md

@@ -4,7 +4,7 @@ emoji: 🔥
 colorFrom: red
 colorTo: indigo
 sdk: gradio
-sdk_version: 4.27.0
+sdk_version: 4.29.0
 app_file: app.py
 pinned: false
 ---

app.py

@@ -12,9 +12,9 @@ from tabs.trades import (
     get_overall_winning_trades,
     get_overall_winning_by_market_trades,
     plot_trades_by_week,
-    plot_trades_per_market_by_week,
+    plot_trades_per_market_by_week2,
     plot_winning_trades_by_week,
-    plot_winning_trades_per_market_by_week,
+    plot_winning_trades_per_market_by_week2,
     plot_trade_details,
 )
 from tabs.tool_win import (
@@ -225,17 +225,17 @@ with demo:
                 trade_details_selector
             with gr.Row():
                 trade_details_plot
-        with gr.TabItem("🔥Trades per market Dashboard"):
+        with gr.TabItem("⚖️Trades per market Dashboard"):
             with gr.Row():
                 gr.Markdown("# Number of trades split by market type per week")
             with gr.Row():
-                trades_by_week_plot = plot_trades_per_market_by_week(
+                trades_by_week_plot = plot_trades_per_market_by_week2(
                     trades_df=get_overall_by_market_trades(trades_df=trades_df)
                 )
             with gr.Row():
                 gr.Markdown("# Percentage of winning trades per week")
             with gr.Row():
-                winning_trades_by_week_plot = plot_winning_trades_per_market_by_week(
+                winning_trades_by_week_plot = plot_winning_trades_per_market_by_week2(
                     trades_df=get_overall_winning_by_market_trades(trades_df=trades_df)
                 )
             # TODO add average ROI value per market

requirements.txt

@@ -4,7 +4,7 @@ matplotlib
 huggingface-hub 
 pyarrow
 requests
-gradio==4.27.0
+gradio==4.29.0
 plotly
 nbformat
 pytz

tabs/trades.py

@@ -1,5 +1,6 @@
 import gradio as gr
 import pandas as pd
+import plotly.express as px
 
 
 HEIGHT = 600
@@ -291,12 +292,30 @@ def plot_trades_per_market_by_week(trades_df: pd.DataFrame) -> gr.BarPlot:
         show_label=True,
         interactive=True,
         show_actions_button=True,
-        tooltip=["month_year_week", "trades"],
+        tooltip=["month_year_week", "market_creator", "trades"],
         height=HEIGHT,
         width=WIDTH,
     )
 
 
+def plot_trades_per_market_by_week2(trades_df: pd.DataFrame) -> gr.Plot:
+    """Plots the trades data for the given tools and calculates the winning percentage."""
+    assert "market_creator" in trades_df.columns
+    fig = px.bar(
+        trades_df,
+        x="month_year_week",
+        y="trades",
+        color="market_creator",
+        color_discrete_sequence=["purple", "goldenrod"],
+        width=1000,
+        height=600,
+    )
+    fig.update_layout(legend=dict(yanchor="top", y=0.99, xanchor="right", x=0.99))
+    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(
@@ -323,7 +342,24 @@ def plot_winning_trades_per_market_by_week(trades_df: pd.DataFrame) -> gr.BarPlo
         show_label=True,
         interactive=True,
         show_actions_button=True,
-        tooltip=["month_year_week", "winning_trade"],
+        tooltip=["month_year_week", "market_creator", "winning_trade"],
         height=HEIGHT,
         width=WIDTH,
     )
+
+
+def plot_winning_trades_per_market_by_week2(trades_df: pd.DataFrame) -> gr.BarPlot:
+    """Plots the winning trades data for the given tools and calculates the winning percentage."""
+    fig = px.bar(
+        trades_df,
+        x="month_year_week",
+        y="winning_trade",
+        color="market_creator",
+        color_discrete_sequence=["purple", "goldenrod"],
+        width=1000,
+        height=600,
+    )
+    fig.update_layout(legend=dict(yanchor="top", y=0.99, xanchor="right", x=0.99))
+    return gr.Plot(
+        value=fig,
+    )