refactor

Author: Andrei Neagu

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/_index.py

@@ -73,34 +73,31 @@ def _render_buttons(node_id: NodeID, service: TrackedServiceModel) -> None:
             on_click=lambda: ui.navigate.to(f"/service/{node_id}:details"),
         )
 
-        def _render_progress() -> None:
-            ui.spinner(size="lg")
-
-        storage_key = f"removing-{node_id}"
-        if app.storage.general.get(storage_key, None):
-            # removal is in progress just render progress bar
-            _render_progress()
+        if service.current_state != SchedulerServiceState.RUNNING:
             return
 
-        if service.current_state == SchedulerServiceState.RUNNING:
-            with ui.row(align_items="baseline").classes("p-0 m-0") as container:
-
-                async def async_task():
-                    container.clear()
+        async def stop_process_task():
+            ui.notify(f"Started service stop request for {node_id}")
 
-                    _render_progress()
-                    app.storage.general[storage_key] = True
+            await httpx.AsyncClient(timeout=10).get(
+                f"http://localhost:{DEFAULT_FASTAPI_PORT}/service/{node_id}:stop"
+            )
 
-                    ui.notify(f"Started service stop request for {node_id}")
+            ui.notify(
+                f"Stop request accepted by {node_id}. Please give the service some time to stop!"
+            )
 
-                    await httpx.AsyncClient(timeout=10).get(
-                        f"http://localhost:{DEFAULT_FASTAPI_PORT}/service/{node_id}:stop"
-                    )
+        with ui.dialog() as confirm_dialog, ui.card():
+            ui.label(f"Are you sure you want to stop the service {node_id}?")
+            ui.label("The service will also result sopped for the user in his project.")
+            with ui.row():
+                ui.button("Yes", on_click=stop_process_task)
+                ui.button("No", on_click=lambda: confirm_dialog.submit("No"))
 
-                    app.storage.general.pop("removing-{node_id}", None)
-                    ui.notify(f"Finished service stop request for {node_id}")
+        async def display_confirm_dialog():
+            await confirm_dialog
 
-                ui.button("Stop service", icon="stop", on_click=async_task)
+        ui.button("Stop service", icon="stop", on_click=display_confirm_dialog)
 
 
 def _render_card(
@@ -112,20 +109,41 @@ def _render_card(
             _render_buttons(node_id, service)
 
 
+def _get_stable_hash(model: TrackedServiceModel) -> dict:
+    data = model.model_dump(mode="json")
+    data.pop("last_state_change")
+    data.pop("check_status_after")
+    data.pop("last_status_notification")
+    return data
+
+
+def _get_hash(items: list[tuple[NodeID, TrackedServiceModel]]) -> int:
+    return hash(
+        json.dumps([(f"{key}", _get_stable_hash(model)) for key, model in items])
+    )
+
+
 class CardUpdater:
     def __init__(self, parent_app: FastAPI, container: Element) -> None:
         self.parent_app = parent_app
         self.container = container
+        self.last_hash: int = _get_hash([])
 
     async def update(self) -> None:
-        # TODO: rerender only if data changed
+        tracked_services = await get_all_tracked_services(self.parent_app)
+        tracked_items: list[tuple[NodeID, TrackedServiceModel]] = sorted(
+            tracked_services.items(), reverse=True
+        )
 
-        self.container.clear()  # Clear the current cards
+        current_hash = _get_hash(tracked_items)
 
-        tracked_services = await get_all_tracked_services(self.parent_app)
+        if self.last_hash != current_hash:
+            # Clear the current cards
+            self.container.clear()
+            for node_id, service in tracked_items:
+                _render_card(self.container, node_id, service)
 
-        for node_id, service in tracked_services.items():
-            _render_card(self.container, node_id, service)
+        self.last_hash = current_hash
 
 
 @router.page("/")
@@ -142,4 +160,4 @@ async def index():
         # render cards when page is loaded
         await updater.update()
         # update card at a set interval
-        ui.timer(1, lambda: updater.update())
+        ui.timer(1, updater.update)

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/frontend/_service.py

@@ -42,6 +42,9 @@ async def service_details(node_id: NodeID):
         ui.markdown("**Start Parameters**")
         ui.code(json.dumps(dynamic_service_start, indent=2), language="json")
 
+        ui.markdown("**RAW**")
+        ui.code(service_model.model_dump_json(indent=2), language="json")
+
 
 @router.page("/service/{node_id}:stop")
 async def service_stop(node_id: NodeID):