renamed

Author: Andrei Neagu

packages/service-library/src/servicelib/long_running_tasks/client_long_running_manager.py renamed to packages/service-library/src/servicelib/long_running_tasks/long_running_client_helper.py

@@ -9,7 +9,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class ClientLongRunningManager:
+class LongRunningClientHelper:
     def __init__(self, redis_settings: RedisSettings):
         self.redis_settings = redis_settings
 
@@ -31,7 +31,7 @@ def _redis(self) -> aioredis.Redis:
         assert self._client  # nosec
         return self._client.redis
 
-    async def cleanup_store(self, lrt_namespace: LRTNamespace) -> None:
+    async def cleanup(self, lrt_namespace: LRTNamespace) -> None:
         """Cleanups all Redis keys for the given LRTNamespace"""
         keys_to_remove: list[str] = [
             x async for x in self._redis.scan_iter(f"{lrt_namespace}*")

packages/service-library/tests/long_running_tasks/test_long_running_tasks_client_long_running_manager.py

@@ -6,8 +6,8 @@
 import pytest
 from pydantic import TypeAdapter
 from servicelib.long_running_tasks._redis_store import RedisStore
-from servicelib.long_running_tasks.client_long_running_manager import (
-    ClientLongRunningManager,
+from servicelib.long_running_tasks.long_running_client_helper import (
+    LongRunningClientHelper,
 )
 from servicelib.long_running_tasks.models import LRTNamespace, TaskData
 from servicelib.redis._client import RedisClientSDK
@@ -46,20 +46,20 @@ async def store(
 
 
 @pytest.fixture
-async def client_long_running_manager(
+async def long_running_client_helper(
     use_in_memory_redis: RedisSettings,
-) -> AsyncIterable[ClientLongRunningManager]:
-    manager = ClientLongRunningManager(redis_settings=use_in_memory_redis)
+) -> AsyncIterable[LongRunningClientHelper]:
+    helper = LongRunningClientHelper(redis_settings=use_in_memory_redis)
 
-    await manager.setup()
-    yield manager
-    await manager.shutdown()
+    await helper.setup()
+    yield helper
+    await helper.shutdown()
 
 
 async def test_cleanup_namespace(
     store: RedisStore,
     task_data: TaskData,
-    client_long_running_manager: ClientLongRunningManager,
+    long_running_client_helper: LongRunningClientHelper,
     lrt_namespace: LRTNamespace,
 ) -> None:
     # create entries in both sides
@@ -73,11 +73,11 @@ async def test_cleanup_namespace(
     }
 
     # removes
-    await client_long_running_manager.cleanup_store(lrt_namespace)
+    await long_running_client_helper.cleanup(lrt_namespace)
 
     # entris were removed
     assert await store.list_tasks_data() == []
     assert await store.list_tasks_to_remove() == {}
 
     # ensore it does not raise errors if there is nothing to remove
-    await client_long_running_manager.cleanup_store(lrt_namespace)
+    await long_running_client_helper.cleanup(lrt_namespace)

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_utils.py

@@ -65,7 +65,7 @@
     UserPreferencesFrontendRepository,
 )
 from ....director_v0 import DirectorV0Client
-from ....long_running_tasks import get_client_long_running_manager
+from ....long_running_tasks import get_long_running_client_helper
 from ....osparc_variables._api_auth_rpc import delete_api_key_by_key
 from ...api_client import (
     SidecarsClient,
@@ -294,10 +294,10 @@ async def service_remove_sidecar_proxy_docker_networks_and_volumes(
 
 
 async def _cleanup_long_running_tasks(app: FastAPI, node_id: NodeID) -> None:
-    clinet_long_running_manager = get_client_long_running_manager(app)
+    long_running_client_helper = get_long_running_client_helper(app)
 
     sidecar_namespace = f"SIMCORE-SERVICE-DYNAMIC-SIDECAR-{node_id}"
-    await clinet_long_running_manager.cleanup_store(sidecar_namespace)
+    await long_running_client_helper.cleanup(sidecar_namespace)
 
 
 async def attempt_pod_removal_and_data_saving(

services/director-v2/src/simcore_service_director_v2/modules/long_running_tasks.py

@@ -1,28 +1,28 @@
 from fastapi import FastAPI
-from servicelib.long_running_tasks.client_long_running_manager import (
-    ClientLongRunningManager,
+from servicelib.long_running_tasks.long_running_client_helper import (
+    LongRunningClientHelper,
 )
 
 
 def setup(app: FastAPI):
     async def _on_startup() -> None:
-        client_long_running_manager = app.state.client_long_running_manager = (
-            ClientLongRunningManager(redis_settings=app.state.settings.REDIS)
+        long_running_client_helper = app.state.long_running_client_helper = (
+            LongRunningClientHelper(redis_settings=app.state.settings.REDIS)
         )
-        await client_long_running_manager.setup()
+        await long_running_client_helper.setup()
 
     async def _on_shutdown() -> None:
-        client_long_running_manager: ClientLongRunningManager = (
-            app.state.client_long_running_manager
+        long_running_client_helper: LongRunningClientHelper = (
+            app.state.long_running_client_helper
         )
-        await client_long_running_manager.shutdown()
+        await long_running_client_helper.shutdown()
 
     app.add_event_handler("startup", _on_startup)
     app.add_event_handler("shutdown", _on_shutdown)
 
 
-def get_client_long_running_manager(app: FastAPI) -> ClientLongRunningManager:
+def get_long_running_client_helper(app: FastAPI) -> LongRunningClientHelper:
     assert isinstance(
-        app.state.client_long_running_manager, ClientLongRunningManager
+        app.state.long_running_client_helper, LongRunningClientHelper
     )  # nosec
-    return app.state.client_long_running_manager
+    return app.state.long_running_client_helper