refactor fo redability

Author: Andrei Neagu

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/system_monitor/_disk_usage.py

@@ -91,11 +91,6 @@ def _normalized_monitored_paths(self) -> dict[MountPathCategory, set[str]]:
             for k, paths in self.monitored_paths.items()
         }
 
-    async def _publish_disk_usage(self, usage: dict[str, DiskUsage]):
-        await publish_disk_usage(
-            self.app, user_id=self.user_id, node_id=self.node_id, usage=usage
-        )
-
     async def _get_measured_disk_usage(self) -> list[DiskUsage]:
         return await logged_gather(
             *[
@@ -136,6 +131,11 @@ def _get_grouped_usage_to_folder_names(
             usage_to_folder_names[disk_usage].add(folder_name)
         return usage_to_folder_names
 
+    async def _publish_disk_usage(self, usage: dict[str, DiskUsage]):
+        await publish_disk_usage(
+            self.app, user_id=self.user_id, node_id=self.node_id, usage=usage
+        )
+
     async def _monitor(self) -> None:
         measured_disk_usage = await self._get_measured_disk_usage()
 

services/dynamic-sidecar/tests/unit/test_modules_system_monitor__disk_usage.py

@@ -209,7 +209,7 @@ async def _wait_for_usage() -> dict[str, DiskUsage]:
         publish_disk_usage_spy.assert_called()
         return publish_disk_usage_spy.call_args_list[0][0][0]
 
-    # normally only 1 value is found
+    # normally only 1 entry is found
     frontend_usage = await _wait_for_usage()
     print(json_dumps(frontend_usage, indent=2))
     assert len(frontend_usage) == 1
@@ -218,7 +218,7 @@ async def _wait_for_usage() -> dict[str, DiskUsage]:
         "1294390525952"
     )
 
-    # emulate EFS
+    # emulate EFS sending metrics, 2 entries are found
 
     disk_usage_monitor.set_disk_usage_for_path(
         {