third commit

app.py

@@ -9,10 +9,10 @@ from tabs.trades import (
     plot_trade_details  
 )
 from tabs.tool_win import (
-    get_tool_winning_rate, 
+    get_tool_winning_rate,
     get_overall_winning_rate,
-    plot_winning_trades,
-    plot_winning_plot_by_tool
+    plot_tool_winnings_overall,
+    plot_tool_winnings_by_tool
 )
 from tabs.error import (
     get_error_data, 
@@ -55,7 +55,7 @@ winning_rate_df = get_tool_winning_rate(
     tools_df=tools_df, 
     inc_tools=INC_TOOLS
 )
-winning_rate_all_df = get_overall_winning_rate(
+winning_rate_overall_df = get_overall_winning_rate(
     wins_df=winning_rate_df
 )
 trades_count_df = get_overall_trades(
@@ -132,19 +132,19 @@ with demo:
                 )
 
             with gr.Row():
-                winning_plot = plot_winning_trades(
-                    wins_df=winning_rate_all_df,
+                winning_plot = plot_tool_winnings_overall(
+                    wins_df=winning_rate_overall_df,
                     winning_selector="win_perc"
                 )
 
-            def update_winning_plot(winning_selector):
-                return plot_winning_trades(
-                    wins_df=winning_rate_all_df,
+            def update_tool_winnings_overall_plot(winning_selector):
+                return plot_tool_winnings_overall(
+                    wins_df=winning_rate_overall_df,
                     winning_selector=winning_selector
                 )
 
             winning_selector.change(
-                plot_winning_trades, 
+                update_tool_winnings_overall_plot,
                 inputs=winning_selector, 
                 outputs=winning_plot
             )
@@ -165,19 +165,19 @@ with demo:
                 )
 
             with gr.Row():
-                plot_tool_win_rate = plot_winning_plot_by_tool(
+                plot_tool_win_rate = plot_tool_winnings_by_tool(
                     wins_df=winning_rate_df,
                     tool=INC_TOOLS[0]
                 )
 
-            def update_tool_win_plot(tool):
-                return plot_winning_plot_by_tool(
+            def update_tool_winnings_by_tool_plot(tool):
+                return plot_tool_winnings_by_tool(
                     wins_df=winning_rate_df,
                     tool=tool
                 )
 
             sel_tool.change(
-                update_tool_win_plot, 
+                update_tool_winnings_by_tool_plot,
                 inputs=sel_tool, 
                 outputs=plot_tool_win_rate
             )

tabs/error.py

@@ -1,6 +1,10 @@
 import pandas as pd
 import gradio as gr
 
+
+HEIGHT=600
+WIDTH=1000
+
 def set_error(row):
     if row.error not in [True, False]:
         if not row.prompt_response:
@@ -31,11 +35,12 @@ def plot_error_data(error_all_df):
         title="Error Percentage",
         x_title="Week",
         y_title="Error Percentage",
-        height=800,
         show_label=True,
         interactive=True,
         show_actions_button=True,
-        tooltip=["request_month_year_week", "error_perc"]
+        tooltip=["request_month_year_week", "error_perc"],
+        height=HEIGHT,
+        width=WIDTH
     )
 
 def plot_tool_error_data(error_df, tool):
@@ -51,10 +56,11 @@ def plot_tool_error_data(error_df, tool):
             interactive=True,
             show_actions_button=True,
             tooltip=["request_month_year_week", "error_perc"],
-            width=800,
             value=error_tool,
             x="request_month_year_week",
-            y="error_perc"
+            y="error_perc",
+            height=HEIGHT,
+            width=WIDTH
     )
 
 def plot_week_error_data(error_df, week):
@@ -68,10 +74,11 @@ def plot_week_error_data(error_df, week):
         title="Error Percentage",
         x_title="Tool",
         y_title="Error Percentage",
-        height=800,
         show_label=True,
         interactive=True,
         show_actions_button=True,
-        tooltip=["tool", "error_perc"]
+        tooltip=["tool", "error_perc"],
+        height=HEIGHT,
+        width=WIDTH
     )
 

tabs/tool_win.py

@@ -1,6 +1,11 @@
 import pandas as pd
 import gradio as gr
 
+
+HEIGHT=600
+WIDTH=1000
+
+
 def set_error(row):
     if row.error not in [True, False]:
         if not row.prompt_response:
@@ -10,21 +15,21 @@ def set_error(row):
 
 
 def get_tool_winning_rate(tools_df, inc_tools):
-    tools_inc = tools_df[tools_df['tool'].isin(inc_tools)]
+    tools_inc = tools_df[tools_df['tool'].isin(inc_tools)].copy()
     tools_inc['error'] = tools_inc.apply(set_error, axis=1)
     tools_non_error = tools_inc[tools_inc['error'] != True]
-    tools_non_error['currentAnswer'].replace('no', 'No', inplace=True)
-    tools_non_error['currentAnswer'].replace('yes', 'Yes', inplace=True)
+    tools_non_error.loc[:, 'currentAnswer'] = tools_non_error['currentAnswer'].replace({'no': 'No', 'yes': 'Yes'})
     tools_non_error = tools_non_error[tools_non_error['currentAnswer'].isin(['Yes', 'No'])]
     tools_non_error = tools_non_error[tools_non_error['vote'].isin(['Yes', 'No'])]
-    tools_non_error['win'] = tools_non_error['currentAnswer'] == tools_non_error['vote']
-    tools_non_error['win'] = tools_non_error['win'].astype(int)
+    tools_non_error['win'] = (tools_non_error['currentAnswer'] == tools_non_error['vote']).astype(int)
     tools_non_error.columns = tools_non_error.columns.astype(str)
     wins = tools_non_error.groupby(['tool', 'request_month_year_week', 'win']).size().unstack().fillna(0)
-    wins['win_perc'] = (wins[1] / (wins[0] + wins[1]))*100
+    wins['win_perc'] = (wins[1] / (wins[0] + wins[1])) * 100
     wins.reset_index(inplace=True)
     wins['total_request'] = wins[0] + wins[1]
     wins.columns = wins.columns.astype(str)
+    # Convert request_month_year_week to string and explicitly set type for Altair
+    wins['request_month_year_week'] = wins['request_month_year_week'].astype(str)
     return wins
 
 
@@ -38,7 +43,7 @@ def get_overall_winning_rate(wins_df):
     return overall_wins
 
 
-def plot_winning_trades(
+def plot_tool_winnings_overall(
     wins_df,
     winning_selector="win_perc"
     ):
@@ -50,14 +55,15 @@ def plot_winning_trades(
         interactive=True,
         show_actions_button=True,
         tooltip=["request_month_year_week", winning_selector],
-        width=800,
         value=wins_df,
         x="request_month_year_week",
-        y=winning_selector
+        y=winning_selector,
+        height=HEIGHT,
+        width=WIDTH
     )
 
 
-def plot_winning_plot_by_tool(wins_df, tool):
+def plot_tool_winnings_by_tool(wins_df, tool):
     return gr.BarPlot(
                 title="Winning Rate", 
                 x_title="Week", 
@@ -65,9 +71,10 @@ def plot_winning_plot_by_tool(wins_df, tool):
                 x="request_month_year_week", 
                 y="win_perc",
                 value=wins_df[wins_df['tool'] == tool],
-                width=800,
                 show_label=True,
                 interactive=True,
                 show_actions_button=True,
-                tooltip=["request_month_year_week", "win_perc"]
+                tooltip=["request_month_year_week", "win_perc"],
+                height=HEIGHT,
+                width=WIDTH
             )

tabs/trades.py

@@ -2,6 +2,9 @@ import gradio as gr
 import pandas as pd
 
 
+HEIGHT=600
+WIDTH=1000
+
 def prepare_trades(trades_df):
     trades_df['creation_timestamp'] = pd.to_datetime(trades_df['creation_timestamp'])
     trades_df['month_year'] = trades_df['creation_timestamp'].dt.to_period('M').astype(str)
@@ -48,7 +51,9 @@ def plot_trade_details(trade_detail, trades_df):
             show_label=True,
             interactive=True,
             show_actions_button=True,
-            tooltip=["month_year_week", "percentile", "mech_calls"]
+            tooltip=["month_year_week", "percentile", "mech_calls"],
+            height=HEIGHT,
+            width=WIDTH
         )
     
     if trade_detail == "collateral amount":
@@ -73,7 +78,9 @@ def plot_trade_details(trade_detail, trades_df):
             show_label=True,
             interactive=True,
             show_actions_button=True,
-            tooltip=["month_year_week", "percentile", "collateral_amount"]
+            tooltip=["month_year_week", "percentile", "collateral_amount"],
+            height=HEIGHT,
+            width=WIDTH
         )
 
     if trade_detail == "earnings":
@@ -98,7 +105,9 @@ def plot_trade_details(trade_detail, trades_df):
             show_label=True,
             interactive=True,
             show_actions_button=True,
-            tooltip=["month_year_week", "percentile", "earnings"]
+            tooltip=["month_year_week", "percentile", "earnings"],
+            height=HEIGHT,
+            width=WIDTH
         )
     
     if trade_detail == "net earnings":
@@ -123,7 +132,9 @@ def plot_trade_details(trade_detail, trades_df):
             show_label=True,
             interactive=True,
             show_actions_button=True,
-            tooltip=["month_year_week", "percentile", "net_earnings"]
+            tooltip=["month_year_week", "percentile", "net_earnings"],
+            height=HEIGHT,
+            width=WIDTH
         )        
     
     if trade_detail == "ROI":
@@ -148,7 +159,9 @@ def plot_trade_details(trade_detail, trades_df):
             show_label=True,
             interactive=True,
             show_actions_button=True,
-            tooltip=["month_year_week", "percentile", "ROI"]
+            tooltip=["month_year_week", "percentile", "ROI"],
+            height=HEIGHT,
+            width=WIDTH
         )    
     
 def plot_trades_by_week(trades_df):
@@ -159,7 +172,9 @@ def plot_trades_by_week(trades_df):
         show_label=True,
         interactive=True,
         show_actions_button=True,
-        tooltip=["month_year_week", "trades"]
+        tooltip=["month_year_week", "trades"],
+        height=HEIGHT,
+        width=WIDTH
     )
 
 def plot_winning_trades_by_week(trades_df):
@@ -170,5 +185,7 @@ def plot_winning_trades_by_week(trades_df):
         show_label=True,
         interactive=True,
         show_actions_button=True,
-        tooltip=["month_year_week", "winning_trade"]
+        tooltip=["month_year_week", "winning_trade"],
+        height=HEIGHT,
+        width=WIDTH
     )