fixed stuck tests and renamed namespace to redis_namespace

Andrei Neagu · Andrei Neagu · commit abab05f2d6d6 · 2025-08-04T14:48:40.000+02:00
diff --git a/packages/service-library/src/servicelib/aiohttp/long_running_tasks/_manager.py b/packages/service-library/src/servicelib/aiohttp/long_running_tasks/_manager.py
@@ -5,7 +5,7 @@
 
 from ...long_running_tasks.base_long_running_manager import BaseLongRunningManager
 from ...long_running_tasks.models import TaskContext
-from ...long_running_tasks.task import Namespace, TasksManager
+from ...long_running_tasks.task import RedisNamespace, TasksManager
 from ._constants import APP_LONG_RUNNING_MANAGER_KEY
 from ._request import get_task_context
 
@@ -17,14 +17,14 @@ def __init__(
         stale_task_check_interval: datetime.timedelta,
         stale_task_detect_timeout: datetime.timedelta,
         redis_settings: RedisSettings,
-        namespace: Namespace,
+        redis_namespace: RedisNamespace,
     ):
         self._app = app
         self._tasks_manager = TasksManager(
             stale_task_check_interval=stale_task_check_interval,
             stale_task_detect_timeout=stale_task_detect_timeout,
             redis_settings=redis_settings,
-            namespace=namespace,
+            redis_namespace=redis_namespace,
         )
 
     @property
diff --git a/packages/service-library/src/servicelib/aiohttp/long_running_tasks/_server.py b/packages/service-library/src/servicelib/aiohttp/long_running_tasks/_server.py
@@ -21,7 +21,7 @@
     DEFAULT_STALE_TASK_DETECT_TIMEOUT,
 )
 from ...long_running_tasks.models import TaskContext, TaskGet
-from ...long_running_tasks.task import Namespace, RegisteredTaskName
+from ...long_running_tasks.task import RedisNamespace, RegisteredTaskName
 from ..typing_extension import Handler
 from . import _routes
 from ._constants import (
@@ -143,7 +143,7 @@ def setup(
     *,
     router_prefix: str,
     redis_settings: RedisSettings,
-    namespace: Namespace,
+    redis_namespace: RedisNamespace,
     handler_check_decorator: Callable = _no_ops_decorator,
     task_request_context_decorator: Callable = _no_task_context_decorator,
     stale_task_check_interval: datetime.timedelta = DEFAULT_STALE_TASK_CHECK_INTERVAL,
@@ -172,7 +172,7 @@ async def on_cleanup_ctx(app: web.Application) -> AsyncGenerator[None, None]:
                 stale_task_check_interval=stale_task_check_interval,
                 stale_task_detect_timeout=stale_task_detect_timeout,
                 redis_settings=redis_settings,
-                namespace=namespace,
+                redis_namespace=redis_namespace,
             )
         )
 
diff --git a/packages/service-library/src/servicelib/fastapi/long_running_tasks/_manager.py b/packages/service-library/src/servicelib/fastapi/long_running_tasks/_manager.py
@@ -4,7 +4,7 @@
 from settings_library.redis import RedisSettings
 
 from ...long_running_tasks.base_long_running_manager import BaseLongRunningManager
-from ...long_running_tasks.task import Namespace, TasksManager
+from ...long_running_tasks.task import RedisNamespace, TasksManager
 
 
 class FastAPILongRunningManager(BaseLongRunningManager):
@@ -14,14 +14,14 @@ def __init__(
         stale_task_check_interval: datetime.timedelta,
         stale_task_detect_timeout: datetime.timedelta,
         redis_settings: RedisSettings,
-        namespace: Namespace,
+        redis_namespace: RedisNamespace,
     ):
         self._app = app
         self._tasks_manager = TasksManager(
             stale_task_check_interval=stale_task_check_interval,
             stale_task_detect_timeout=stale_task_detect_timeout,
             redis_settings=redis_settings,
-            namespace=namespace,
+            redis_namespace=redis_namespace,
         )
 
     @property
diff --git a/packages/service-library/src/servicelib/fastapi/long_running_tasks/_server.py b/packages/service-library/src/servicelib/fastapi/long_running_tasks/_server.py
@@ -8,7 +8,7 @@
     DEFAULT_STALE_TASK_DETECT_TIMEOUT,
 )
 from ...long_running_tasks.errors import BaseLongRunningError
-from ...long_running_tasks.task import Namespace
+from ...long_running_tasks.task import RedisNamespace
 from ._error_handlers import base_long_running_error_handler
 from ._manager import FastAPILongRunningManager
 from ._routes import router
@@ -19,7 +19,7 @@ def setup(
     *,
     router_prefix: str = "",
     redis_settings: RedisSettings,
-    namespace: Namespace,
+    redis_namespace: RedisNamespace,
     stale_task_check_interval: datetime.timedelta = DEFAULT_STALE_TASK_CHECK_INTERVAL,
     stale_task_detect_timeout: datetime.timedelta = DEFAULT_STALE_TASK_DETECT_TIMEOUT,
 ) -> None:
@@ -46,7 +46,7 @@ async def on_startup() -> None:
                 stale_task_check_interval=stale_task_check_interval,
                 stale_task_detect_timeout=stale_task_detect_timeout,
                 redis_settings=redis_settings,
-                namespace=namespace,
+                redis_namespace=redis_namespace,
             )
         )
         await long_running_manager.setup()
diff --git a/packages/service-library/src/servicelib/long_running_tasks/task.py b/packages/service-library/src/servicelib/long_running_tasks/task.py
@@ -41,7 +41,7 @@
 
 
 RegisteredTaskName: TypeAlias = str
-Namespace: TypeAlias = str
+RedisNamespace: TypeAlias = str
 
 
 class TaskProtocol(Protocol):
@@ -109,17 +109,17 @@ def __init__(
         redis_settings: RedisSettings,
         stale_task_check_interval: datetime.timedelta,
         stale_task_detect_timeout: datetime.timedelta,
-        namespace: Namespace,
+        redis_namespace: RedisNamespace,
     ):
         # Task groups: Every taskname maps to multiple asyncio.Task within TrackedTask model
-        self._tasks_data: BaseStore = RedisStore(redis_settings, namespace)
+        self._tasks_data: BaseStore = RedisStore(redis_settings, redis_namespace)
         self._created_tasks: dict[TaskId, asyncio.Task] = {}
 
         self.stale_task_check_interval = stale_task_check_interval
         self.stale_task_detect_timeout_s: PositiveFloat = (
             stale_task_detect_timeout.total_seconds()
         )
-        self.namespace = namespace
+        self.redis_namespace = redis_namespace
         self.redis_settings = redis_settings
 
         self._stale_tasks_monitor_task: asyncio.Task | None = None
@@ -135,14 +135,14 @@ async def setup(self) -> None:
 
         self.redis_client_sdk = RedisClientSDK(
             self.redis_settings.build_redis_dsn(RedisDatabase.LOCKS),
-            client_name=f"long_running_tasks_store_{self.namespace}_lock",
+            client_name=f"long_running_tasks_store_{self.redis_namespace}_lock",
         )
         await self.redis_client_sdk.setup()
 
         self._stale_tasks_monitor_task = create_periodic_task(
             task=exclusive(
                 self.redis_client_sdk,
-                lock_key=f"{__name__}_{self.namespace}_stale_tasks_monitor",
+                lock_key=f"{__name__}_{self.redis_namespace}_stale_tasks_monitor",
             )(self._stale_tasks_monitor_worker),
             interval=self.stale_task_check_interval,
             task_name=f"{__name__}.{self._stale_tasks_monitor_worker.__name__}",
@@ -404,7 +404,7 @@ async def remove_task(
 
     def _get_task_id(self, task_name: str, *, is_unique: bool) -> TaskId:
         unique_part = "unique" if is_unique else f"{uuid4()}"
-        return f"{self.namespace}.{task_name}.{unique_part}"
+        return f"{self.redis_namespace}.{task_name}.{unique_part}"
 
     async def _update_progress(
         self,
diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py
@@ -47,7 +47,10 @@ def app(
     # this adds enveloping and error middlewares
     append_rest_middlewares(app, api_version="")
     long_running_tasks.server.setup(
-        app, redis_settings=redis_service, namespace="test", router_prefix="/futures"
+        app,
+        redis_settings=redis_service,
+        redis_namespace="test",
+        router_prefix="/futures",
     )
 
     return app
diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py
@@ -32,7 +32,10 @@ def app(
     # this adds enveloping and error middlewares
     append_rest_middlewares(app, api_version="")
     long_running_tasks.server.setup(
-        app, redis_settings=redis_service, namespace="test", router_prefix="/futures"
+        app,
+        redis_settings=redis_service,
+        redis_namespace="test",
+        router_prefix="/futures",
     )
 
     return app
diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py
@@ -76,7 +76,7 @@ def app_with_task_context(
     long_running_tasks.server.setup(
         app,
         redis_settings=redis_service,
-        namespace="test",
+        redis_namespace="test",
         router_prefix="/futures_with_task_context",
         task_request_context_decorator=task_context_decorator,
     )
diff --git a/packages/service-library/tests/fastapi/long_running_tasks/conftest.py b/packages/service-library/tests/fastapi/long_running_tasks/conftest.py
@@ -17,7 +17,10 @@ async def bg_task_app(router_prefix: str, redis_service: RedisSettings) -> FastA
     app = FastAPI()
 
     long_running_tasks.server.setup(
-        app, redis_settings=redis_service, namespace="test", router_prefix=router_prefix
+        app,
+        redis_settings=redis_service,
+        redis_namespace="test",
+        router_prefix=router_prefix,
     )
     return app
 
diff --git a/packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks.py b/packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks.py
@@ -102,7 +102,7 @@ async def app(
     # overrides fastapi/conftest.py:app
     app = FastAPI(title="test app")
     app.include_router(server_routes)
-    setup_server(app, redis_settings=redis_service, namespace="test")
+    setup_server(app, redis_settings=redis_service, redis_namespace="test")
     setup_client(app)
     async with LifespanManager(app):
         yield app
diff --git a/packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks_context_manager.py b/packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks_context_manager.py
@@ -101,7 +101,10 @@ async def bg_task_app(
     app.include_router(user_routes)
 
     setup_server(
-        app, router_prefix=router_prefix, redis_settings=redis_service, namespace="test"
+        app,
+        router_prefix=router_prefix,
+        redis_settings=redis_service,
+        redis_namespace="test",
     )
     setup_client(app, router_prefix=router_prefix)
 
diff --git a/packages/service-library/tests/long_running_tasks/test_long_running_tasks_task.py b/packages/service-library/tests/long_running_tasks/test_long_running_tasks_task.py
@@ -22,7 +22,11 @@
     TaskNotRegisteredError,
 )
 from servicelib.long_running_tasks.models import TaskContext, TaskProgress, TaskStatus
-from servicelib.long_running_tasks.task import TaskRegistry, TasksManager
+from servicelib.long_running_tasks.task import (
+    RedisNamespace,
+    TaskRegistry,
+    TasksManager,
+)
 from settings_library.redis import RedisSettings
 from tenacity import TryAgain
 from tenacity.asyncio import AsyncRetrying
@@ -78,17 +82,21 @@ def empty_context() -> TaskContext:
 
 
 @pytest.fixture
-async def get_tasks_manager() -> (
-    AsyncIterator[Callable[[RedisSettings], Awaitable[TasksManager]]]
-):
+async def get_tasks_manager(
+    faker: Faker,
+) -> AsyncIterator[
+    Callable[[RedisSettings, RedisNamespace | None], Awaitable[TasksManager]]
+]:
     managers: list[TasksManager] = []
 
-    async def _(redis_settings: RedisSettings) -> TasksManager:
+    async def _(
+        redis_settings: RedisSettings, namespace: RedisNamespace | None
+    ) -> TasksManager:
         tasks_manager = TasksManager(
             stale_task_check_interval=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),
             stale_task_detect_timeout=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),
             redis_settings=redis_settings,
-            namespace="test",
+            redis_namespace=namespace or f"test{faker.uuid4()}",
         )
         await tasks_manager.setup()
         managers.append(tasks_manager)
@@ -97,16 +105,18 @@ async def _(redis_settings: RedisSettings) -> TasksManager:
     yield _
 
     for manager in managers:
-        with suppress(Exception):  # avoids tests form hanging on test teardown
-            await manager.teardown()
+        with suppress(TimeoutError):  # avoids tets hanging on teardown
+            await asyncio.wait_for(manager.teardown(), timeout=10)
 
 
 @pytest.fixture
 async def tasks_manager(
     use_in_memory_redis: RedisSettings,
-    get_tasks_manager: Callable[[RedisSettings], Awaitable[TasksManager]],
+    get_tasks_manager: Callable[
+        [RedisSettings, RedisNamespace | None], Awaitable[TasksManager]
+    ],
 ) -> TasksManager:
-    return await get_tasks_manager(use_in_memory_redis)
+    return await get_tasks_manager(use_in_memory_redis, None)
 
 
 @pytest.mark.parametrize("check_task_presence_before", [True, False])
@@ -332,12 +342,14 @@ async def test_get_result_finished_with_error(
 
 async def test_cancel_task_from_different_manager(
     use_in_memory_redis: RedisSettings,
-    get_tasks_manager: Callable[[RedisSettings], Awaitable[TasksManager]],
+    get_tasks_manager: Callable[
+        [RedisSettings, RedisNamespace | None], Awaitable[TasksManager]
+    ],
     empty_context: TaskContext,
 ):
-    manager_1 = await get_tasks_manager(use_in_memory_redis)
-    manager_2 = await get_tasks_manager(use_in_memory_redis)
-    manager_3 = await get_tasks_manager(use_in_memory_redis)
+    manager_1 = await get_tasks_manager(use_in_memory_redis, "test-namespace")
+    manager_2 = await get_tasks_manager(use_in_memory_redis, "test-namespace")
+    manager_3 = await get_tasks_manager(use_in_memory_redis, "test-namespace")
 
     task_id = await lrt_api.start_task(
         manager_1,
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/module_setup.py b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/module_setup.py
@@ -1,19 +1,21 @@
 from fastapi import FastAPI
 from servicelib.fastapi import long_running_tasks
-from servicelib.long_running_tasks.task import Namespace
+from servicelib.long_running_tasks.task import RedisNamespace
 
 from ...core.settings import AppSettings
 from . import api_client, scheduler
 
-_LONG_RUNNING_TASKS_NAMESPACE: Namespace = "director-v2"
+_LONG_RUNNING_TASKS_NAMESPACE: RedisNamespace = "director-v2"
 
 
 def setup(app: FastAPI) -> None:
     settings: AppSettings = app.state.settings
 
     long_running_tasks.client.setup(app)
     long_running_tasks.server.setup(
-        app, redis_settings=settings.REDIS, namespace=_LONG_RUNNING_TASKS_NAMESPACE
+        app,
+        redis_settings=settings.REDIS,
+        redis_namespace=_LONG_RUNNING_TASKS_NAMESPACE,
     )
 
     async def on_startup() -> None:
diff --git a/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py b/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py
@@ -149,7 +149,7 @@ def create_base_app() -> FastAPI:
     long_running_tasks.server.setup(
         app,
         redis_settings=app_settings.REDIS_SETTINGS,
-        namespace=f"dy_sidecar-{app_settings.DY_SIDECAR_RUN_ID}",
+        redis_namespace=f"dy_sidecar-{app_settings.DY_SIDECAR_RUN_ID}",
     )
 
     app.include_router(get_main_router(app))
diff --git a/services/storage/src/simcore_service_storage/modules/long_running_tasks.py b/services/storage/src/simcore_service_storage/modules/long_running_tasks.py
@@ -2,18 +2,18 @@
 
 from fastapi import FastAPI
 from servicelib.fastapi.long_running_tasks._server import setup
-from servicelib.long_running_tasks.task import Namespace
+from servicelib.long_running_tasks.task import RedisNamespace
 
 from .._meta import API_VTAG
 from ..core.settings import get_application_settings
 
-_LONG_RUNNING_TASKS_NAMESPACE: Final[Namespace] = "storage"
+_LONG_RUNNING_TASKS_NAMESPACE: Final[RedisNamespace] = "storage"
 
 
 def setup_rest_api_long_running_tasks_for_uploads(app: FastAPI) -> None:
     setup(
         app,
         router_prefix=f"/{API_VTAG}/futures",
         redis_settings=get_application_settings(app).STORAGE_REDIS,
-        namespace=_LONG_RUNNING_TASKS_NAMESPACE,
+        redis_namespace=_LONG_RUNNING_TASKS_NAMESPACE,
     )
diff --git a/services/web/server/src/simcore_service_webserver/long_running_tasks.py b/services/web/server/src/simcore_service_webserver/long_running_tasks.py
@@ -10,7 +10,7 @@
 )
 from servicelib.aiohttp.long_running_tasks.server import setup
 from servicelib.aiohttp.typing_extension import Handler
-from servicelib.long_running_tasks.task import Namespace
+from servicelib.long_running_tasks.task import RedisNamespace
 
 from . import redis
 from ._meta import API_VTAG
@@ -19,7 +19,7 @@
 
 _logger = logging.getLogger(__name__)
 
-_LONG_RUNNING_TASKS_NAMESPACE: Final[Namespace] = "webserver-legacy"
+_LONG_RUNNING_TASKS_NAMESPACE: Final[RedisNamespace] = "webserver-legacy"
 
 
 def webserver_request_context_decorator(handler: Handler):
@@ -40,7 +40,7 @@ def setup_long_running_tasks(app: web.Application) -> None:
     setup(
         app,
         redis_settings=redis.get_plugin_settings(app),
-        namespace=_LONG_RUNNING_TASKS_NAMESPACE,
+        redis_namespace=_LONG_RUNNING_TASKS_NAMESPACE,
         router_prefix=f"/{API_VTAG}/tasks-legacy",
         handler_check_decorator=login_required,
         task_request_context_decorator=webserver_request_context_decorator,

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def app_with_task_context(`
`76`	`76`	`long_running_tasks.server.setup(`
`77`	`77`	`app,`
`78`	`78`	`redis_settings=redis_service,`
`79`		`- namespace="test",`
	`79`	`+ redis_namespace="test",`
`80`	`80`	`router_prefix="/futures_with_task_context",`
`81`	`81`	`task_request_context_decorator=task_context_decorator,`
`82`	`82`	`)`