better refresh data

app.py

@@ -30,10 +30,82 @@ from tabs.error import (
 from tabs.about import about_olas_predict
 
 
+def update_trades_plots():
+    global tools_df, trades_df, error_df, error_overall_df, winning_rate_df, winning_rate_overall_df, trades_count_df, trades_winning_rate_df
+
+    refresh_data()
+
+    updated_trades_by_week_plot = plot_trades_by_week(
+            trades_df=trades_count_df
+        )
+
+    updated_winning_trades_by_week_plot = plot_winning_trades_by_week(
+        trades_df=trades_winning_rate_df
+    )
+
+    updated_trade_details_plot = plot_trade_details(
+            trade_detail="mech calls",
+            trades_df=trades_df
+        )
+
+    return (
+        updated_trades_by_week_plot,
+        updated_winning_trades_by_week_plot,
+        updated_trade_details_plot
+    )
+
+
+def update_tool_winnings_plots():
+    global tools_df, trades_df, error_df, error_overall_df, winning_rate_df, winning_rate_overall_df, trades_count_df, trades_winning_rate_df
+
+    refresh_data()
+
+    updated_winning_plot = plot_tool_winnings_overall(
+            wins_df=winning_rate_overall_df,
+            winning_selector="win_perc"
+        )
+
+    updated_tool_winnings_by_tool_plot = plot_tool_winnings_by_tool(
+            wins_df=winning_rate_df,
+            tool=INC_TOOLS[0]
+        )
+
+    return (
+        updated_winning_plot,
+        updated_tool_winnings_by_tool_plot
+    )
+
+def update_error_plots():
+    global tools_df, trades_df, error_df, error_overall_df, winning_rate_df, winning_rate_overall_df, trades_count_df, trades_winning_rate_df
+
+    refresh_data()
+
+    updated_error_overall_plot = plot_error_data(
+            error_all_df=error_overall_df
+        )
+    
+    updated_tool_error_plot = plot_tool_error_data(
+            error_df=error_df,
+            tool=INC_TOOLS[0]
+        )
+
+    updated_week_error_plot = plot_week_error_data(
+            error_df=error_df,
+            week=choices[-1]
+        )
+
+    return (
+        updated_error_overall_plot,
+        updated_tool_error_plot,
+        updated_week_error_plot
+    )
+
 def refresh_data():
     try:
         global tools_df, trades_df, error_df, error_overall_df, winning_rate_df, winning_rate_overall_df, trades_count_df, trades_winning_rate_df
+        
         logging.info("Refreshing data...")
+        
         tools_df = pd.read_csv("./data/tools.csv", low_memory=False)
         trades_df = pd.read_csv("./data/all_trades_profitability.csv")
         trades_df = prepare_trades(trades_df)
@@ -43,6 +115,7 @@ def refresh_data():
         winning_rate_overall_df = get_overall_winning_rate(wins_df=winning_rate_df)
         trades_count_df = get_overall_trades(trades_df=trades_df)
         trades_winning_rate_df = get_overall_winning_trades(trades_df=trades_df)
+                
         logging.info("Data refreshed.")
     except Exception as e:
         logging.error("Failed to refresh data: %s", e)
@@ -53,6 +126,7 @@ def pull_refresh_data():
     try:
         result = subprocess.run(["python", "./scripts/pull_data.py"], check=True)
         logging.info("Script executed successfully: %s", result)
+        refresh_data()
     except subprocess.CalledProcessError as e:
         logging.error("Failed to run script: %s", e)
         return  # Stop execution if the script fails
@@ -113,13 +187,13 @@ with demo:
             with gr.Row():
                 gr.Markdown("# Plot of number of trades by week")
             with gr.Row():
-                plot_trades_by_week = plot_trades_by_week(
+                trades_by_week_plot = plot_trades_by_week(
                     trades_df=trades_count_df
                 )
             with gr.Row():
                 gr.Markdown("# Plot of winning trades by week")
             with gr.Row():
-                plot_winning_trades_by_week = plot_winning_trades_by_week(
+                winning_trades_by_week_plot = plot_winning_trades_by_week(
                     trades_df=trades_winning_rate_df
                 )
             with gr.Row():
@@ -162,17 +236,15 @@ with demo:
             with gr.Row():
                 with gr.Column():
                     refresh_button = gr.Button("Refresh Data")
-                with gr.Column():
-                    latest_data_label = gr.Label(
-                        value=f"Last data point: {trades_df['creation_timestamp'].max()}"
-                    )
 
-            def refresh_callback():
-                refresh_data()
-                latest_data_label.value = f"Last data point: {trades_df['creation_timestamp'].max()}"
-                return latest_data_label.value
-
-            refresh_button.click(refresh_callback, outputs=latest_data_label)
+            refresh_button.click(
+                update_trades_plots, 
+                outputs=[
+                    trades_by_week_plot,
+                    winning_trades_by_week_plot,
+                    trade_details_plot,
+                ]
+            )
 
         with gr.TabItem("🚀 Tool Winning Dashboard"):
             with gr.Row():
@@ -219,7 +291,7 @@ with demo:
                 )
 
             with gr.Row():
-                plot_tool_win_rate = plot_tool_winnings_by_tool(
+                tool_winnings_by_tool_plot = plot_tool_winnings_by_tool(
                     wins_df=winning_rate_df,
                     tool=INC_TOOLS[0]
                 )
@@ -233,19 +305,30 @@ with demo:
             sel_tool.change(
                 update_tool_winnings_by_tool_plot,
                 inputs=sel_tool, 
-                outputs=plot_tool_win_rate
+                outputs=tool_winnings_by_tool_plot
             )
 
             with gr.Row():
                 sel_tool
             with gr.Row():
-                plot_tool_win_rate
+                tool_winnings_by_tool_plot
+            with gr.Row():
+                refresh_button = gr.Button("Refresh Data")
+
+            refresh_button.click(
+                update_tool_winnings_plots, 
+                outputs=[
+                    winning_plot,
+                    tool_winnings_by_tool_plot
+                ]
+            )
+            
 
         with gr.TabItem("🏥 Tool Error Dashboard"):
             with gr.Row():
                 gr.Markdown("# Plot showing overall error")
             with gr.Row():
-                plot_error_data(
+                error_overall_plot = plot_error_data(
                     error_all_df=error_overall_df
                 )
             with gr.Row():
@@ -258,7 +341,7 @@ with demo:
                 )
 
             with gr.Row():
-                plot_tool_error = plot_tool_error_data(
+                tool_error_plot = plot_tool_error_data(
                     error_df=error_df,
                     tool=INC_TOOLS[0]
                 )
@@ -273,12 +356,12 @@ with demo:
             sel_tool.change(
                 update_tool_error_plot, 
                 inputs=sel_tool, 
-                outputs=plot_tool_error
+                outputs=tool_error_plot
             )
             with gr.Row():
                 sel_tool
             with gr.Row():
-                plot_tool_error
+                tool_error_plot
 
             with gr.Row():
                 gr.Markdown("# Plot showing error by week")
@@ -294,7 +377,7 @@ with demo:
                     )
 
             with gr.Row():
-                plot_week_error = plot_week_error_data(
+                week_error_plot = plot_week_error_data(
                     error_df=error_df,
                     week=choices[-1]
                 )
@@ -305,17 +388,29 @@ with demo:
                     week=selected_week
                 )
 
-            sel_tool.change(update_tool_error_plot, inputs=sel_tool, outputs=plot_tool_error)
-            sel_week.change(update_week_error_plot, inputs=sel_week, outputs=plot_week_error)
+            sel_tool.change(update_tool_error_plot, inputs=sel_tool, outputs=tool_error_plot)
+            sel_week.change(update_week_error_plot, inputs=sel_week, outputs=week_error_plot)
 
             with gr.Row():
                 sel_tool
             with gr.Row():
-                plot_tool_error
+                tool_error_plot
             with gr.Row():
                 sel_week
             with gr.Row():
-                plot_week_error
+                week_error_plot
+            
+            with gr.Row():
+                refresh_button = gr.Button("Refresh Data")
+
+            refresh_button.click(
+                update_error_plots, 
+                outputs=[
+                    error_overall_plot,
+                    tool_error_plot,
+                    week_error_plot
+                ]
+            )
 
         with gr.TabItem("ℹ️ About"):
             with gr.Accordion("About Olas Predict"):

data/all_trades_profitability.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72fb0e0fef1fd1dca99a5eb13126b892c7e57007c5f82985e84a4017ed603d9
-size 30934774
+oid sha256:0ed325e54d1901d69a27fbb18a19e3d7479bd2e89eac8fad22e5cbe01abfd335
+size 32001583

data/delivers.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ab02c18ce54ffd37dfb2602f2da3db92c2a3a302c797618eb045b51084a4098
-size 1807054756
+oid sha256:0d7e07db2af936529c721932218be4832d7dbe113dbb50e534bb8bf060d609cc
+size 2014149364

data/fpmmTrades.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19fd7a791f784004f7f04fd10cec62b7868452925aeaa70157cfa6da0c1afeb7
-size 68441241
+oid sha256:3e4abd630e8476e2d6cbfe684f14a843d7ae22e750133e4c4ee96e12ffabdb03
+size 69980018

data/fpmms.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:054fb82ef35ad64b3d1835d8708a355a36f75b742eccec74301fc828959aad23
-size 423147
+oid sha256:04cb5e845138d2e7d69e699521fc3fa9adac5bc67438ad5afc0aab0dc9488568
+size 429913

data/requests.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1248612c06090d0d576ea7f438b60990c9043256ce53f6bf3b871b42ed0eab90
-size 144528918
+oid sha256:13b123c5b509f37032582888b51a9536c3c855a3954bbf6695e1ff23c1fc7f42
+size 148756035

data/summary_profitability.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2956b3f0d3a21b8c11a770cdb78e0655acab2164f2f680b4fa2addb449fcec62
-size 54358
+oid sha256:d2129ca0d2324e5c10fc2220913d0ef28067a788e69d3f84d2a261eed1f57588
+size 56460

data/t_map.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e18c0957b8513a2f91a60ba7f83553752a261bdf150a24cb065cc30d52e0b92f
-size 6585190
+oid sha256:4ac7f44ec10ae465f40149c039181a427f82ff6e820a88f17207d33b8a7237fc
+size 6781847

data/tools.csv

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a56b54aba97829458a543662334b4b66d64f69522f86a1427d31a3a6888f0aa
-size 1911388629
+oid sha256:6657130c88b5e3f90d53725b5fb1646af030d45e33175cdb3cf6e5a81d5e740d
+size 2121884792

test.py

@@ -0,0 +1,92 @@
+import gradio as gr
+import pandas as pd
+
+
+demo = gr.Blocks()
+
+data1 = pd.DataFrame({
+    "tool": ["tool1", "tool2", "tool3"],
+    "error": [0.1, 0.2, 0.3]
+})
+
+data2 = pd.DataFrame({
+    "tool": ["tool1", "tool2", "tool3", "tool4"],
+    "error": [0.1, 0.2, 0.3, 0.4]
+})
+
+data3 = pd.DataFrame({
+    "tool": ["tool1", "tool2", "tool3", "tool4", "tool5"],
+    "error": [0.1, 0.2, 0.3, 0.4, 0.5]
+})
+
+
+def update_plot1():
+    data = pd.DataFrame({
+        "tool": ["tool1", "tool2", "tool3", "tool4"],
+        "error": [0.1, 0.2, 0.3, 0.4]
+    })
+    return gr.BarPlot(
+        data,
+        x="tool",
+        y="error"
+    )
+
+def update_plot2():
+    data = pd.DataFrame({
+        "tool": ["tool1", "tool2", "tool3", "tool4", "tool5"],
+        "error": [0.1, 0.2, 0.3, 0.4, 0.5]
+    })
+    return gr.BarPlot(
+        data,
+        x="tool",
+        y="error"
+    )
+
+def update_plot3():
+    data = pd.DataFrame({
+        "tool": ["tool1", "tool2", "tool3", "tool4", "tool5", "tool6"],
+        "error": [0.1, 0.2, 0.3, 0.4, 0.5, 0.6]
+    })
+    return gr.BarPlot(
+        data,
+        x="tool",
+        y="error"
+    )
+
+def update_plots():
+    return update_plot1(), update_plot2(), update_plot3()
+
+with demo:
+    with gr.Row():
+        plot1 = gr.BarPlot(
+            data1,
+            x="tool",
+            y="error"
+        )
+    
+    with gr.Row():
+        plot2 = gr.BarPlot(
+            data2,
+            x="tool",
+            y="error"
+        )
+
+    with gr.Row():
+        plot3 = gr.BarPlot(
+            data3,
+            x="tool",
+            y="error"
+        )
+
+    with gr.Row():
+        update_button = gr.Button("Update")
+
+        update_button.click(
+            update_plots,
+            inputs=[],
+            outputs=[plot1, plot2, plot3]
+        )
+
+demo.launch(
+    debug=True
+)