backwards compatibility

Author: sanderegg

packages/service-library/src/servicelib/project_lock.py

@@ -9,7 +9,7 @@
 from models_library.projects_access import Owner
 from models_library.projects_state import ProjectLocked, ProjectStatus
 
-from .redis import RedisClientSDK, exclusive
+from .redis import CouldNotAcquireLockError, RedisClientSDK, exclusive
 
 PROJECT_REDIS_LOCK_KEY: str = "project_lock:{}"
 PROJECT_LOCK_TIMEOUT: Final[datetime.timedelta] = datetime.timedelta(seconds=10)
@@ -33,18 +33,24 @@ def with_locked_project(
     def _decorator(
         func: Callable[P, Coroutine[Any, Any, R]],
     ) -> Callable[P, Coroutine[Any, Any, R]]:
-        @exclusive(
-            redis_client,
-            lock_key=PROJECT_REDIS_LOCK_KEY.format(project_uuid),
-            lock_value=ProjectLocked(
-                value=True,
-                owner=owner,
-                status=status,
-            ).model_dump_json(),
-        )
         @functools.wraps(func)
         async def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
-            return await func(*args, **kwargs)
+            @exclusive(
+                redis_client,
+                lock_key=PROJECT_REDIS_LOCK_KEY.format(project_uuid),
+                lock_value=ProjectLocked(
+                    value=True,
+                    owner=owner,
+                    status=status,
+                ).model_dump_json(),
+            )
+            async def _exclusive_func(*args, **kwargs) -> R:
+                return await func(*args, **kwargs)
+
+            try:
+                return await _exclusive_func(*args, **kwargs)
+            except CouldNotAcquireLockError as e:
+                raise ProjectLockError from e
 
         return _wrapper