Merge pull request #740 from OpenTrafficCam/bug/8343-await-all-methods-decorated-with-actions

bug/8343-await-all-methods-decorated-with-actions

Author: briemla

OTAnalytics/adapter_ui/dummy_viewmodel.py

@@ -1037,7 +1037,7 @@ def _set_section_data(self, id: SectionId, data: dict) -> None:
             self.treeview_sections.update_selected_items([id.serialize()])
 
     @action
-    def remove_sections(self) -> None:
+    async def remove_sections(self) -> None:
         if not (selected_section_ids := self.get_selected_section_ids()):
             position = self.treeview_sections.get_position()
             self._ui_factory.info_box(
@@ -1318,7 +1318,7 @@ async def _edit_flow(self, flow: Flow) -> None:
             self.__update_flow_data(flow_data=flow_data)
 
     @action
-    def remove_flows(self) -> None:
+    async def remove_flows(self) -> None:
         if flow_ids := self._application.flow_state.selected_flows.get():
             for flow_id in flow_ids:
                 self._application.remove_flow(flow_id)

OTAnalytics/adapter_ui/view_model.py

@@ -217,7 +217,7 @@ async def edit_selected_section_metadata(self) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def remove_sections(self) -> None:
+    async def remove_sections(self) -> None:
         raise NotImplementedError
 
     @abstractmethod
@@ -245,7 +245,7 @@ async def edit_selected_flow(self) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def remove_flows(self) -> None:
+    async def remove_flows(self) -> None:
         raise NotImplementedError
 
     @abstractmethod

OTAnalytics/plugin_ui/customtkinter_gui/frame_files.py

@@ -1,3 +1,4 @@
+import asyncio
 import tkinter
 from pathlib import Path
 from typing import Any
@@ -34,7 +35,7 @@ def _get_widgets(self) -> None:
         )
         self.treeview.configure(yscrollcommand=self._treeview_scrollbar.set)
         self.button_add_files = CTkButton(
-            master=self, text="Load", command=self._viewmodel.load_tracks
+            master=self, text="Load", command=self._do_load_tracks
         )
 
     def _place_widgets(self) -> None:
@@ -47,6 +48,10 @@ def _place_widgets(self) -> None:
         )
         self.button_add_files.grid(row=1, column=0, padx=PADX, pady=PADY, sticky=STICKY)
 
+    def _do_load_tracks(self) -> None:
+        # Run the async load_tracks method in a blocking way for CTkButton
+        asyncio.run(self._viewmodel.load_tracks())
+
 
 COLUMN_FILE = "File"
 COLUMN_TRACKS = "Tracks"

OTAnalytics/plugin_ui/customtkinter_gui/frame_flows.py

@@ -55,7 +55,7 @@ def _get_widgets(self) -> None:
             command=self._edit_selected_flow,
         )
         self.button_remove = CTkButton(
-            master=self, text="Remove", command=self._viewmodel.remove_flows
+            master=self, text="Remove", command=self._remove_flows
         )
 
     def _place_widgets(self) -> None:
@@ -79,6 +79,9 @@ def _add_flow(self) -> None:
     def _edit_selected_flow(self) -> None:
         asyncio.run(self._viewmodel.edit_selected_flow())
 
+    def _remove_flows(self) -> None:
+        asyncio.run(self._viewmodel.remove_flows())
+
     def _set_button_state_categories(self) -> None:
         self._general_buttons: list[CTkButton] = []
         self._add_buttons = [

OTAnalytics/plugin_ui/customtkinter_gui/frame_sections.py

@@ -64,7 +64,7 @@ def _get_widgets(self) -> None:
         self.button_remove = CTkButton(
             master=self,
             text="Remove",
-            command=self._viewmodel.remove_sections,
+            command=self._remove_sections,
         )
 
     def _place_widgets(self) -> None:
@@ -88,6 +88,9 @@ def _place_widgets(self) -> None:
     def _edit_selected_section_metadata(self) -> None:
         asyncio.run(self._viewmodel.edit_selected_section_metadata())
 
+    def _remove_sections(self) -> None:
+        asyncio.run(self._viewmodel.remove_sections())
+
     def _set_button_state_categories(self) -> None:
         self._general_buttons: list[CTkButton] = []
         self._add_buttons = [

OTAnalytics/plugin_ui/nicegui_gui/pages/sections_and_flow_form/flow_form.py

@@ -15,6 +15,7 @@
     COLUMN_ID,
     CustomTable,
 )
+from OTAnalytics.plugin_ui.utils.asyncio_helper import run_async
 
 BUTTON_WIDTH = "max-width: 45%; width: 100%"
 BASIC_WIDTH = "width: 100%"
@@ -108,7 +109,7 @@ def generate_flow(self) -> None:
         self._viewmodel.generate_flows()
 
     def remove_flow(self) -> None:
-        self._viewmodel.remove_flows()
+        run_async(self._viewmodel.remove_flows())
 
     async def show_flow_properties(self) -> None:
         await self._viewmodel.edit_selected_flow()

OTAnalytics/plugin_ui/nicegui_gui/pages/sections_and_flow_form/sections_form.py

@@ -16,6 +16,7 @@
     COLUMN_ID,
     CustomTable,
 )
+from OTAnalytics.plugin_ui.utils.asyncio_helper import run_async
 
 BUTTON_WIDTH = "max-width: 45%; width: 100%"
 BASIC_WIDTH = "width: 100%"
@@ -111,7 +112,7 @@ def build(self) -> Self:
             with ui.row().style(BASIC_WIDTH):
                 self._button_remove = ui.button(
                     self._resource_manager.get(SectionKeys.BUTTON_REMOVE),
-                    on_click=self._viewmodel.remove_sections,
+                    on_click=self.remove_sections,
                 ).style(BASIC_WIDTH)
                 self._button_remove.mark(MARKER_BUTTON_REMOVE)
         self.update_items()
@@ -138,6 +139,9 @@ def _notify_viewmodel_about_selected_item_ids(self, ids: list[str]) -> None:
     def update_selected_items(self, item_ids: list[str]) -> None:
         self._section_table.select(item_ids)
 
+    def remove_sections(self) -> None:
+        run_async(self._viewmodel.remove_sections())
+
     def update_items(self) -> None:
         self._section_table.update(map_to_ui(self._viewmodel.get_all_sections()))
         selected_sections = [

OTAnalytics/plugin_ui/utils/__init__.py

@@ -0,0 +1,12 @@
+import asyncio
+from typing import Coroutine
+
+
+def run_async(coro: Coroutine) -> None:
+    # Schedule the asynchronous removal so tests see the call immediately
+    # while NiceGUI executes the coroutine in the event loop.
+    try:
+        asyncio.create_task(coro)
+    except RuntimeError:
+        # No running loop available; run the coroutine to completion
+        asyncio.run(coro)