separating dependencies

Author: sanderegg

packages/service-library/src/servicelib/redis/_project_lock.py

@@ -1,5 +1,5 @@
 import functools
-from collections.abc import Callable, Coroutine
+from collections.abc import Awaitable, Callable, Coroutine
 from typing import Any, Final, ParamSpec, TypeVar
 
 from models_library.projects import ProjectID
@@ -67,6 +67,43 @@ async def _exclusive_func(*args, **kwargs) -> R:
     return _decorator
 
 
+def with_project_locked_and_notify(
+    redis_client: RedisClientSDK | Callable[..., RedisClientSDK],
+    *,
+    project_uuid: str,
+    status: ProjectStatus,
+    owner: Owner,
+    notification_cb: Callable[[], Awaitable[None]] | None,
+) -> Callable[
+    [Callable[P, Coroutine[Any, Any, R]]], Callable[P, Coroutine[Any, Any, R]]
+]:
+    def _decorator(
+        func: Callable[P, Coroutine[Any, Any, R]],
+    ) -> Callable[P, Coroutine[Any, Any, R]]:
+        @functools.wraps(func)
+        async def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
+            @with_project_locked(
+                redis_client,
+                project_uuid=project_uuid,
+                status=status,
+                owner=owner,
+            )
+            async def _locked_func() -> R:
+                if notification_cb is not None:
+                    await notification_cb()
+
+                return await func(*args, **kwargs)
+
+            result = await _locked_func()
+            if notification_cb is not None:
+                await notification_cb()
+            return result
+
+        return _wrapper
+
+    return _decorator
+
+
 async def is_project_locked(
     redis_client: RedisClientSDK, project_uuid: str | ProjectID
 ) -> bool:

services/web/server/src/simcore_service_webserver/exporter/_handlers.py

@@ -15,6 +15,7 @@
 from ..login.decorators import login_required
 from ..projects.api import with_project_locked_and_notify
 from ..projects.projects_api import retrieve_and_notify_project_locked_state
+from ..redis import get_redis_lock_manager_client_sdk
 from ..security.decorators import permission_required
 from ..users.api import get_user_fullname
 from ._formatter.archive import get_sds_archive_path
@@ -46,7 +47,7 @@ async def export_project(request: web.Request):
     assert project_uuid  # nosec
 
     @with_project_locked_and_notify(
-        request.app,
+        get_redis_lock_manager_client_sdk(request.app),
         project_uuid=project_uuid,
         status=ProjectStatus.EXPORTING,
         owner=Owner(

services/web/server/src/simcore_service_webserver/projects/_crud_api_create.py

@@ -18,6 +18,7 @@
 from pydantic import TypeAdapter
 from servicelib.aiohttp.long_running_tasks.server import TaskProgress
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
+from servicelib.redis._project_lock import with_project_locked_and_notify
 from simcore_postgres_database.utils_projects_nodes import (
     ProjectNode,
     ProjectNodeCreate,
@@ -29,6 +30,7 @@
 from ..director_v2 import api as director_v2_api
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..folders import _folders_repository as folders_db
+from ..redis import get_redis_lock_manager_client_sdk
 from ..storage.api import (
     copy_data_folders_from_project,
     get_project_total_size_simcore_s3,
@@ -40,7 +42,6 @@
 from . import projects_api
 from ._metadata_api import set_project_ancestors
 from ._permalink_api import update_or_pop_permalink_in_project
-from ._projects_locks_utils import with_project_locked_and_notify
 from .db import ProjectDBAPI
 from .exceptions import (
     ParentNodeNotFoundError,
@@ -182,16 +183,20 @@ async def _copy() -> None:
                 await long_running_task.result()
 
     if needs_lock_source_project:
+
+        async def _notification_cb() -> None:
+            await projects_api.retrieve_and_notify_project_locked_state(
+                user_id, source_project["uuid"], app
+            )
+
         await with_project_locked_and_notify(
-            app,
+            get_redis_lock_manager_client_sdk(app),
             project_uuid=source_project["uuid"],
             status=ProjectStatus.CLONING,
             owner=Owner(
                 user_id=user_id, **await get_user_fullname(app, user_id=user_id)
             ),
-            notification_cb=projects_api.retrieve_and_notify_project_locked_state(
-                user_id, source_project["uuid"], app
-            ),
+            notification_cb=_notification_cb,
         )(_copy)()
     else:
         await _copy()

services/web/server/src/simcore_service_webserver/projects/_projects_locks_utils.py

@@ -11,7 +11,6 @@
 )
 from ._permalink_api import ProjectPermalink
 from ._permalink_api import register_factory as register_permalink_factory
-from ._projects_locks_utils import with_project_locked_and_notify
 from ._wallets_api import (
     check_project_financial_status,
     connect_wallet_to_project,
@@ -28,7 +27,6 @@
     "ProjectPermalink",
     "register_permalink_factory",
     "check_project_financial_status",
-    "with_project_locked_and_notify",
 )
 
 

services/web/server/src/simcore_service_webserver/projects/api.py

@@ -82,6 +82,7 @@
 )
 from servicelib.redis import get_project_locked_state, is_project_locked
 from servicelib.redis._decorators import exclusive
+from servicelib.redis._project_lock import with_project_locked_and_notify
 from servicelib.utils import fire_and_forget_task, logged_gather
 from simcore_postgres_database.models.users import UserRole
 from simcore_postgres_database.utils_projects_nodes import (
@@ -128,7 +129,6 @@
 )
 from ._db_utils import PermissionStr
 from ._nodes_utils import set_reservation_same_as_limit, validate_new_service_resources
-from ._projects_locks_utils import with_project_locked_and_notify
 from ._wallets_api import connect_wallet_to_project, get_project_wallet
 from .db import APP_PROJECT_DBAPI, ProjectDBAPI
 from .exceptions import (
@@ -1258,7 +1258,7 @@ async def try_open_project_for_user(
     try:
 
         @with_project_locked_and_notify(
-            app,
+            get_redis_lock_manager_client_sdk(app),
             project_uuid=project_uuid,
             status=ProjectStatus.OPENING,
             owner=Owner(
@@ -1757,7 +1757,7 @@ async def remove_project_dynamic_services(
     # -------------------
 
     @with_project_locked_and_notify(
-        app,
+        get_redis_lock_manager_client_sdk(app),
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,
         owner=Owner(user_id=user_id, **user_name_data),