refactor servies to use proper interface

Author: Andrei Neagu

services/director-v2/src/simcore_service_director_v2/api/routes/dynamic_scheduler.py

@@ -4,15 +4,16 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 from models_library.projects_nodes_io import NodeID
 from pydantic import BaseModel, PositiveInt
-from servicelib.fastapi.long_running_tasks.server import get_tasks_manager
+from servicelib.fastapi.long_running_tasks._manager import FastAPILongRunningManager
+from servicelib.fastapi.long_running_tasks.server import get_long_running_manager
 from servicelib.long_running_tasks.errors import TaskAlreadyRunningError
 from servicelib.long_running_tasks.models import (
     ProgressMessage,
     ProgressPercent,
     TaskId,
     TaskProgress,
 )
-from servicelib.long_running_tasks.task import TasksManager, start_task
+from servicelib.long_running_tasks.task import start_task
 from tenacity import retry
 from tenacity.before_sleep import before_sleep_log
 from tenacity.retry import retry_if_result
@@ -91,7 +92,9 @@ async def update_service_observation(
 )
 async def delete_service_containers(
     node_uuid: NodeID,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     dynamic_sidecars_scheduler: Annotated[
         DynamicSidecarsScheduler, Depends(get_dynamic_sidecar_scheduler)
     ],
@@ -110,7 +113,7 @@ async def _progress_callback(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=_task_remove_service_containers,  # type: ignore[arg-type]
             unique=True,
             node_uuid=node_uuid,
@@ -149,7 +152,9 @@ async def get_service_state(
 )
 async def save_service_state(
     node_uuid: NodeID,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     dynamic_sidecars_scheduler: Annotated[
         DynamicSidecarsScheduler, Depends(get_dynamic_sidecar_scheduler)
     ],
@@ -169,7 +174,7 @@ async def _progress_callback(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=_task_save_service_state,  # type: ignore[arg-type]
             unique=True,
             node_uuid=node_uuid,
@@ -191,7 +196,9 @@ async def _progress_callback(
 )
 async def push_service_outputs(
     node_uuid: NodeID,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     dynamic_sidecars_scheduler: Annotated[
         DynamicSidecarsScheduler, Depends(get_dynamic_sidecar_scheduler)
     ],
@@ -210,7 +217,7 @@ async def _progress_callback(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=_task_push_service_outputs,  # type: ignore[arg-type]
             unique=True,
             node_uuid=node_uuid,
@@ -232,7 +239,9 @@ async def _progress_callback(
 )
 async def delete_service_docker_resources(
     node_uuid: NodeID,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     dynamic_sidecars_scheduler: Annotated[
         DynamicSidecarsScheduler, Depends(get_dynamic_sidecar_scheduler)
     ],
@@ -246,7 +255,7 @@ async def _task_cleanup_service_docker_resources(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=_task_cleanup_service_docker_resources,  # type: ignore[arg-type]
             unique=True,
             node_uuid=node_uuid,

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers_long_running_tasks.py

@@ -2,11 +2,12 @@
 from typing import Annotated, cast
 
 from fastapi import APIRouter, Depends, FastAPI, Request, status
-from servicelib.fastapi.long_running_tasks.server import get_tasks_manager
+from servicelib.fastapi.long_running_tasks._manager import FastAPILongRunningManager
+from servicelib.fastapi.long_running_tasks.server import get_long_running_manager
 from servicelib.fastapi.requests_decorators import cancel_on_disconnect
 from servicelib.long_running_tasks.errors import TaskAlreadyRunningError
 from servicelib.long_running_tasks.models import TaskId
-from servicelib.long_running_tasks.task import TasksManager, start_task
+from servicelib.long_running_tasks.task import start_task
 
 from ...core.settings import ApplicationSettings
 from ...models.schemas.application_health import ApplicationHealth
@@ -48,15 +49,17 @@
 @cancel_on_disconnect
 async def pull_user_servcices_docker_images(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     shared_store: Annotated[SharedStore, Depends(get_shared_store)],
     app: Annotated[FastAPI, Depends(get_application)],
 ) -> TaskId:
     assert request  # nosec
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_pull_user_servcices_docker_images,
             unique=True,
             app=app,
@@ -85,7 +88,9 @@ async def pull_user_servcices_docker_images(
 async def create_service_containers_task(  # pylint: disable=too-many-arguments
     request: Request,
     containers_create: ContainersCreate,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
     shared_store: Annotated[SharedStore, Depends(get_shared_store)],
     app: Annotated[FastAPI, Depends(get_application)],
@@ -95,7 +100,7 @@ async def create_service_containers_task(  # pylint: disable=too-many-arguments
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_create_service_containers,
             unique=True,
             settings=settings,
@@ -117,7 +122,9 @@ async def create_service_containers_task(  # pylint: disable=too-many-arguments
 @cancel_on_disconnect
 async def runs_docker_compose_down_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
     shared_store: Annotated[SharedStore, Depends(get_shared_store)],
     app: Annotated[FastAPI, Depends(get_application)],
@@ -127,7 +134,7 @@ async def runs_docker_compose_down_task(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_runs_docker_compose_down,
             unique=True,
             app=app,
@@ -148,7 +155,9 @@ async def runs_docker_compose_down_task(
 @cancel_on_disconnect
 async def state_restore_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
     mounted_volumes: Annotated[MountedVolumes, Depends(get_mounted_volumes)],
     app: Annotated[FastAPI, Depends(get_application)],
@@ -157,7 +166,7 @@ async def state_restore_task(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_restore_state,
             unique=True,
             settings=settings,
@@ -177,7 +186,9 @@ async def state_restore_task(
 @cancel_on_disconnect
 async def state_save_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     app: Annotated[FastAPI, Depends(get_application)],
     mounted_volumes: Annotated[MountedVolumes, Depends(get_mounted_volumes)],
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
@@ -186,7 +197,7 @@ async def state_save_task(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_save_state,
             unique=True,
             settings=settings,
@@ -206,7 +217,9 @@ async def state_save_task(
 @cancel_on_disconnect
 async def ports_inputs_pull_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     app: Annotated[FastAPI, Depends(get_application)],
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
     mounted_volumes: Annotated[MountedVolumes, Depends(get_mounted_volumes)],
@@ -217,7 +230,7 @@ async def ports_inputs_pull_task(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_ports_inputs_pull,
             unique=True,
             port_keys=port_keys,
@@ -239,7 +252,9 @@ async def ports_inputs_pull_task(
 @cancel_on_disconnect
 async def ports_outputs_pull_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     app: Annotated[FastAPI, Depends(get_application)],
     mounted_volumes: Annotated[MountedVolumes, Depends(get_mounted_volumes)],
     port_keys: list[str] | None = None,
@@ -248,7 +263,7 @@ async def ports_outputs_pull_task(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_ports_outputs_pull,
             unique=True,
             port_keys=port_keys,
@@ -268,15 +283,17 @@ async def ports_outputs_pull_task(
 @cancel_on_disconnect
 async def ports_outputs_push_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     outputs_manager: Annotated[OutputsManager, Depends(get_outputs_manager)],
     app: Annotated[FastAPI, Depends(get_application)],
 ) -> TaskId:
     assert request  # nosec
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_ports_outputs_push,
             unique=True,
             outputs_manager=outputs_manager,
@@ -295,7 +312,9 @@ async def ports_outputs_push_task(
 @cancel_on_disconnect
 async def containers_restart_task(
     request: Request,
-    tasks_manager: Annotated[TasksManager, Depends(get_tasks_manager)],
+    long_running_manager: Annotated[
+        FastAPILongRunningManager, Depends(get_long_running_manager)
+    ],
     app: Annotated[FastAPI, Depends(get_application)],
     settings: Annotated[ApplicationSettings, Depends(get_settings)],
     shared_store: Annotated[SharedStore, Depends(get_shared_store)],
@@ -304,7 +323,7 @@ async def containers_restart_task(
 
     try:
         return start_task(
-            tasks_manager,
+            long_running_manager.tasks_manager,
             task=task_containers_restart,
             unique=True,
             app=app,