Fix toml deps, fix chart refreshing

Author: froggleston

ftui/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.6"
+__version__ = "0.1.7"

ftui/freqtext.css

@@ -201,6 +201,19 @@ ListView Label {
     link-color: goldenrod;
 }
 
+#dsh-chart-header {
+    dock: top;
+    height: 1;
+    background: #222;
+}
+
+#dash-refresh-chart-button {
+    dock: right;
+    height: 1;
+    border: none;
+    margin-right: 1;
+}
+
 #bot-chart-header {
     dock: top;
     height: 1;

ftui/ftui_helpers.py

@@ -258,7 +258,6 @@ def dash_closed_trades_table(row_data, colours=FtuiColours()) -> Table:
 def dash_cumulative_profit_plot_data(trades, bot_list=[], pair=None):
     if trades.shape[0] > 0 and bot_list:
         # Filter trades to what's in the bot_list
-        # trades = trades.loc[trades["Bot"] == bot].copy()
         trades = trades.loc[trades['Bot'].apply(lambda x: x in bot_list)].copy()
 
         # Filter trades to one pair

ftui/screens/dashboard_screen.py

@@ -5,8 +5,9 @@
 from rich.text import Text
 from textual import on, work
 from textual.app import ComposeResult
-from textual.containers import Container
+from textual.containers import Container, Horizontal
 from textual.widgets import (
+    Button,
     Collapsible,
     Digits,
     Footer,
@@ -71,6 +72,10 @@ def compose(self) -> ComposeResult:
 
                     with Collapsible(title="Cumulative Profit", id="dsh-cp-collap", collapsed=True):
                         with Container(id="dsh-chart-container"):
+                            with Horizontal(id="dsh-chart-header"):
+                                yield Button(
+                                    "Refresh", id="dash-refresh-chart-button", variant="success"
+                                )
                             yield SelectionList(id="dsh-chart-bot-list", classes="bg-static-default")
                             yield PlotextPlot(id="dash-cumprof-profit", classes="bg-static-default collap-update")
 
@@ -125,8 +130,7 @@ async def update_per_five_sec(self):
 
         dsh_cp_collap = self.query_one("#dsh-cp-collap")
         if dsh_cp_collap.collapsed is False:
-            selected_bots = self.query_one("#dsh-chart-bot-list").selected
-            self.update_cumulative_profit_plot(bot_list = selected_bots)
+            self.update_cumulative_profit_plot()
 
     def _render_open_trade_data(self, data, trading_mode="spot"):
         row_data = []
@@ -426,10 +430,12 @@ def update_dashboard_all_trade_summary(self):
         ats = self.query_one("#dash-all-trade-summary")
         ats.loading = False
 
-    @work(group="dash_chart_worker", exclusive=True, thread=True)
+    @work(group="dash_chart_worker", exclusive=False, thread=True)
     def update_cumulative_profit_plot(self, bot_list=None):
         client_dfs = self.app.client_dfs
 
+        bot_list = self.query_one("#dsh-chart-bot-list").selected
+
         all_cum_data = pd.DataFrame()
         if "all_closed" in client_dfs:
             if bot_list is None or not bot_list:
@@ -446,6 +452,7 @@ def update_cumulative_profit_plot(self, bot_list=None):
             chart_container = self.query_one("#dash-cumprof-profit")
             cplt = chart_container.plt
             cplt.clear_data()
+            cplt.clf()
 
             dfmt = "Y-m-d"
             cplt.date_form(dfmt)
@@ -466,6 +473,8 @@ def update_cumulative_profit_plot(self, bot_list=None):
             )
             cplt.ylabel("Profit")
 
+            self.app.call_from_thread(chart_container.refresh)
+
             worker = get_current_worker()
             if not worker.is_cancelled:
                 self.app.call_from_thread(chart_container.set_loading, False)
@@ -474,9 +483,11 @@ def update_cumulative_profit_plot(self, bot_list=None):
     def update_cum_plot_from_list(self) -> None:
         chart_container = self.query_one("#dash-cumprof-profit")
         chart_container.loading = True
+        self.update_cumulative_profit_plot()
 
-        selected_bots = self.query_one("#dsh-chart-bot-list").selected
-        self.update_cumulative_profit_plot(bot_list = selected_bots)
+    @on(Button.Pressed, "#dash-refresh-chart-button")
+    def refresh_dash_chart_button_pressed(self) -> None:
+        self.update_cum_plot_from_list()
 
     @on(Collapsible.Toggled)
     def toggle_collapsible(self, event: Collapsible.Toggled) -> None:

ftui/screens/main_bot_screen.py

@@ -532,7 +532,7 @@ def _render_tag_summary(self, ftuic):
             self.app.call_from_thread(dt.update, table)
         dt.loading = False
 
-    @work(group="bot_chart_worker", exclusive=True, thread=True)
+    @work(group="bot_chart_worker", exclusive=False, thread=True)
     def update_chart(self, bot_id, pair=None, refresh=False):
         client_dict = self.app.client_dict
         client_dfs = self.app.client_dfs
@@ -745,10 +745,7 @@ def _render_chart(self, ftuic, pair, data):
                     severity="warning",
                 )
 
-        #worker = get_current_worker()
-        #if not worker.is_cancelled:
-        #    self.app.call_from_thread(chart_container.loading, False)
-        chart_container.loading = False
+        self.app.call_from_thread(chart_container.set_loading, False)
 
     # bot performance tab
     @work(group="perf_summary_worker", exclusive=True, thread=True)