refactor

Author: sanderegg

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

@@ -5,11 +5,11 @@
     CouldNotAcquireLockError,
     CouldNotConnectToRedisError,
     LockLostError,
+    ProjectLockError,
 )
 from ._models import RedisManagerDBConfig
 from ._project_lock import (
     PROJECT_REDIS_LOCK_KEY,
-    ProjectLockError,
     get_project_locked_state,
     is_project_locked,
     with_project_locked,

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

@@ -1,3 +1,6 @@
+from typing import TypeAlias
+
+import redis.exceptions
 from common_library.errors_classes import OsparcErrorMixin
 
 
@@ -19,3 +22,6 @@ class LockLostError(BaseRedisError):
         "TIP: check connection to Redis DBs or look for Synchronous "
         "code that might block the auto-extender task. Somehow the distributed lock disappeared!"
     )
+
+
+ProjectLockError: TypeAlias = redis.exceptions.LockError  # NOTE: backwards compatible

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

@@ -1,19 +1,16 @@
 import functools
 from collections.abc import Callable, Coroutine
-from typing import Any, Final, ParamSpec, TypeAlias, TypeVar
+from typing import Any, Final, ParamSpec, TypeVar
 
-import redis
-import redis.exceptions
 from models_library.projects import ProjectID
 from models_library.projects_access import Owner
 from models_library.projects_state import ProjectLocked, ProjectStatus
 
 from . import CouldNotAcquireLockError, RedisClientSDK, exclusive
+from ._errors import ProjectLockError
 
 PROJECT_REDIS_LOCK_KEY: Final[str] = "project_lock:{}"
 
-ProjectLockError: TypeAlias = redis.exceptions.LockError
-
 
 P = ParamSpec("P")
 R = TypeVar("R")