cleanup

Author: sanderegg

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

@@ -22,7 +22,8 @@ def with_project_locked(
     *,
     project_uuid: str | ProjectID,
     status: ProjectStatus,
-    owner: Owner | None = None,
+    owner: Owner | None,
+    notification_cb: Callable[[], Awaitable[None]] | None,
 ) -> Callable[
     [Callable[P, Coroutine[Any, Any, R]]], Callable[P, Coroutine[Any, Any, R]]
 ]:
@@ -32,9 +33,8 @@ def with_project_locked(
         redis_client -- the client to use to access redis
         project_uuid -- the project UUID
         status -- the project status
-
-    Keyword Arguments:
         owner -- the owner of the lock (default: {None})
+        notification_cb -- a notification callback that will be called AFTER the project is locked and AFTER it was unlocked
 
     Returns:
         the decorated function return value
@@ -55,49 +55,18 @@ async def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
                 ).model_dump_json(),
             )
             async def _exclusive_func(*args, **kwargs) -> R:
+                if notification_cb is not None:
+                    await notification_cb()
                 return await func(*args, **kwargs)
 
             try:
-                return await _exclusive_func(*args, **kwargs)
-            except CouldNotAcquireLockError as e:
-                raise ProjectLockError from e
-
-        return _wrapper
-
-    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:
+                result = await _exclusive_func(*args, **kwargs)
+                # we are now unlocked
                 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 result
+            except CouldNotAcquireLockError as e:
+                raise ProjectLockError from e
 
         return _wrapper
 

services/clusters-keeper/src/simcore_service_clusters_keeper/rpc/clusters.py

@@ -7,8 +7,7 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from servicelib.rabbitmq import RPCRouter
-from servicelib.redis._client import RedisClientSDK
-from servicelib.redis._decorators import exclusive
+from servicelib.redis import RedisClientSDK, exclusive
 
 from ..core.settings import get_application_settings
 from ..modules import clusters

services/efs-guardian/src/simcore_service_efs_guardian/services/process_messages.py

@@ -9,7 +9,7 @@
 from servicelib.rabbitmq.rpc_interfaces.dynamic_sidecar.disk_usage import (
     update_disk_usage,
 )
-from servicelib.redis._decorators import exclusive
+from servicelib.redis import exclusive
 from servicelib.utils import fire_and_forget_task
 
 from ..core.settings import get_application_settings

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

@@ -8,12 +8,12 @@
 from aiohttp import web
 from models_library.projects_access import Owner
 from models_library.projects_state import ProjectStatus
+from servicelib.redis import with_project_locked
 from servicelib.request_keys import RQT_USERID_KEY
 
 from .._constants import RQ_PRODUCT_KEY
 from .._meta import API_VTAG
 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
@@ -46,7 +46,7 @@ async def export_project(request: web.Request):
     project_uuid = request.match_info.get("project_id")
     assert project_uuid  # nosec
 
-    @with_project_locked_and_notify(
+    @with_project_locked(
         get_redis_lock_manager_client_sdk(request.app),
         project_uuid=project_uuid,
         status=ProjectStatus.EXPORTING,

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

@@ -18,7 +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 servicelib.redis import with_project_locked
 from simcore_postgres_database.utils_projects_nodes import (
     ProjectNode,
     ProjectNodeCreate,
@@ -189,7 +189,7 @@ async def _notification_cb() -> None:
                 user_id, source_project["uuid"], app
             )
 
-        await with_project_locked_and_notify(
+        await with_project_locked(
             get_redis_lock_manager_client_sdk(app),
             project_uuid=source_project["uuid"],
             status=ProjectStatus.CLONING,

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

@@ -80,9 +80,12 @@
     ServiceWaitingForManualInterventionError,
     ServiceWasNotFoundError,
 )
-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.redis import (
+    exclusive,
+    get_project_locked_state,
+    is_project_locked,
+    with_project_locked,
+)
 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 (
@@ -1257,7 +1260,7 @@ async def try_open_project_for_user(
     """
     try:
 
-        @with_project_locked_and_notify(
+        @with_project_locked(
             get_redis_lock_manager_client_sdk(app),
             project_uuid=project_uuid,
             status=ProjectStatus.OPENING,
@@ -1756,7 +1759,7 @@ async def remove_project_dynamic_services(
         save_state = False
     # -------------------
 
-    @with_project_locked_and_notify(
+    @with_project_locked(
         get_redis_lock_manager_client_sdk(app),
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,

services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py

@@ -31,11 +31,11 @@
 )
 from servicelib.aiohttp import status
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
+from servicelib.redis import with_project_locked
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.projects_to_products import projects_to_products
 from simcore_service_webserver._meta import api_version_prefix
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.exporter._handlers import with_project_locked_and_notify
 from simcore_service_webserver.projects import _crud_api_delete
 from simcore_service_webserver.projects.models import ProjectDict
 from socketio.exceptions import ConnectionError as SocketConnectionError
@@ -230,7 +230,7 @@ async def test_delete_project_while_it_is_locked_raises_error(
 
     project_uuid = user_project["uuid"]
     user_id = logged_user["id"]
-    await with_project_locked_and_notify(
+    await with_project_locked(
         app=client.app,
         project_uuid=project_uuid,
         status=ProjectStatus.CLOSING,