renamed

Author: Andrei Neagu

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_manager.py

@@ -1,12 +1,12 @@
 from aiohttp import web
 
+from ...long_running_tasks.manager import LongRunningManager
 from ...long_running_tasks.models import TaskContext
-from ...long_running_tasks.server_long_running_manager import ServerLongRunningManager
 from ._constants import APP_LONG_RUNNING_MANAGER_KEY
 from ._request import get_task_context
 
 
-class AiohttpLongRunningManager(ServerLongRunningManager):
+class AiohttpLongRunningManager(LongRunningManager):
 
     @staticmethod
     def get_task_context(request: web.Request) -> TaskContext:

packages/service-library/src/servicelib/fastapi/long_running_tasks/_manager.py

@@ -1,10 +1,10 @@
 from fastapi import Request
 
+from ...long_running_tasks.manager import LongRunningManager
 from ...long_running_tasks.models import TaskContext
-from ...long_running_tasks.server_long_running_manager import ServerLongRunningManager
 
 
-class FastAPILongRunningManager(ServerLongRunningManager):
+class FastAPILongRunningManager(LongRunningManager):
     @staticmethod
     def get_task_context(request: Request) -> TaskContext:
         _ = request

packages/service-library/src/servicelib/long_running_tasks/_rpc_server.py

@@ -15,15 +15,15 @@
 _logger = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from .server_long_running_manager import ServerLongRunningManager
+    from .manager import LongRunningManager
 
 
 router = RPCRouter()
 
 
 @router.expose(reraise_if_error_type=(BaseLongRunningError,))
 async def start_task(
-    long_running_manager: "ServerLongRunningManager",
+    long_running_manager: "LongRunningManager",
     *,
     registered_task_name: RegisteredTaskName,
     unique: bool = False,
@@ -44,7 +44,7 @@ async def start_task(
 
 @router.expose(reraise_if_error_type=(BaseLongRunningError,))
 async def list_tasks(
-    long_running_manager: "ServerLongRunningManager", *, task_context: TaskContext
+    long_running_manager: "LongRunningManager", *, task_context: TaskContext
 ) -> list[TaskBase]:
     return await long_running_manager.tasks_manager.list_tasks(
         with_task_context=task_context
@@ -53,7 +53,7 @@ async def list_tasks(
 
 @router.expose(reraise_if_error_type=(BaseLongRunningError,))
 async def get_task_status(
-    long_running_manager: "ServerLongRunningManager",
+    long_running_manager: "LongRunningManager",
     *,
     task_context: TaskContext,
     task_id: TaskId,
@@ -65,7 +65,7 @@ async def get_task_status(
 
 @router.expose(reraise_if_error_type=(BaseLongRunningError, RPCTransferrableTaskError))
 async def get_task_result(
-    long_running_manager: "ServerLongRunningManager",
+    long_running_manager: "LongRunningManager",
     *,
     task_context: TaskContext,
     task_id: TaskId,
@@ -94,7 +94,7 @@ async def get_task_result(
 
 @router.expose(reraise_if_error_type=(BaseLongRunningError,))
 async def remove_task(
-    long_running_manager: "ServerLongRunningManager",
+    long_running_manager: "LongRunningManager",
     *,
     task_context: TaskContext,
     task_id: TaskId,

packages/service-library/src/servicelib/long_running_tasks/server_long_running_manager.py renamed to packages/service-library/src/servicelib/long_running_tasks/manager.py

@@ -11,7 +11,7 @@
 from .task import TasksManager
 
 
-class ServerLongRunningManager(ABC):
+class LongRunningManager(ABC):
     """
     Provides a commond inteface for aiohttp and fastapi services
     """

packages/service-library/tests/long_running_tasks/conftest.py

@@ -11,10 +11,10 @@
 from faker import Faker
 from pytest_mock import MockerFixture
 from servicelib.logging_utils import log_catch
-from servicelib.long_running_tasks.models import LRTNamespace, TaskContext
-from servicelib.long_running_tasks.server_long_running_manager import (
-    ServerLongRunningManager,
+from servicelib.long_running_tasks.manager import (
+    LongRunningManager,
 )
+from servicelib.long_running_tasks.models import LRTNamespace, TaskContext
 from servicelib.long_running_tasks.task import TasksManager
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from settings_library.rabbit import RabbitSettings
@@ -24,7 +24,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class _TestingLongRunningManager(ServerLongRunningManager):
+class _TestingLongRunningManager(LongRunningManager):
     @staticmethod
     def get_task_context(request) -> TaskContext:
         _ = request
@@ -37,16 +37,16 @@ async def get_long_running_manager(
 ) -> AsyncIterator[
     Callable[
         [RedisSettings, RabbitSettings, LRTNamespace | None],
-        Awaitable[ServerLongRunningManager],
+        Awaitable[LongRunningManager],
     ]
 ]:
-    managers: list[ServerLongRunningManager] = []
+    managers: list[LongRunningManager] = []
 
     async def _(
         redis_settings: RedisSettings,
         rabbit_settings: RabbitSettings,
         lrt_namespace: LRTNamespace | None,
-    ) -> ServerLongRunningManager:
+    ) -> LongRunningManager:
         manager = _TestingLongRunningManager(
             stale_task_check_interval=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),
             stale_task_detect_timeout=timedelta(seconds=TEST_CHECK_STALE_INTERVAL_S),

packages/service-library/tests/long_running_tasks/test_long_running_tasks_lrt_api.py

@@ -11,10 +11,10 @@
 from pydantic import NonNegativeInt
 from servicelib.long_running_tasks import lrt_api
 from servicelib.long_running_tasks.errors import TaskNotFoundError
-from servicelib.long_running_tasks.models import LRTNamespace, TaskContext
-from servicelib.long_running_tasks.server_long_running_manager import (
-    ServerLongRunningManager,
+from servicelib.long_running_tasks.manager import (
+    LongRunningManager,
 )
+from servicelib.long_running_tasks.models import LRTNamespace, TaskContext
 from servicelib.long_running_tasks.task import TaskId, TaskRegistry
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from settings_library.rabbit import RabbitSettings
@@ -75,10 +75,10 @@ async def long_running_managers(
     rabbit_service: RabbitSettings,
     get_long_running_manager: Callable[
         [RedisSettings, RabbitSettings, LRTNamespace | None],
-        Awaitable[ServerLongRunningManager],
+        Awaitable[LongRunningManager],
     ],
-) -> list[ServerLongRunningManager]:
-    maanagers: list[ServerLongRunningManager] = []
+) -> list[LongRunningManager]:
+    maanagers: list[LongRunningManager] = []
     for _ in range(managers_count):
         long_running_manager = await get_long_running_manager(
             use_in_memory_redis, rabbit_service, "some-service"
@@ -89,14 +89,14 @@ async def long_running_managers(
 
 
 def _get_long_running_manager(
-    long_running_managers: list[ServerLongRunningManager],
-) -> ServerLongRunningManager:
+    long_running_managers: list[LongRunningManager],
+) -> LongRunningManager:
     return secrets.choice(long_running_managers)
 
 
 async def _assert_task_status(
     rabbitmq_rpc_client: RabbitMQRPCClient,
-    long_running_manager: ServerLongRunningManager,
+    long_running_manager: LongRunningManager,
     task_id: TaskId,
     *,
     is_done: bool
@@ -109,7 +109,7 @@ async def _assert_task_status(
 
 async def _assert_task_status_on_random_manager(
     rabbitmq_rpc_client: RabbitMQRPCClient,
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     task_ids: list[TaskId],
     *,
     is_done: bool = True
@@ -126,7 +126,7 @@ async def _assert_task_status_on_random_manager(
 
 async def _assert_task_status_done_on_all_managers(
     rabbitmq_rpc_client: RabbitMQRPCClient,
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     task_id: TaskId,
     *,
     is_done: bool = True
@@ -149,7 +149,7 @@ async def _assert_task_status_done_on_all_managers(
 
 async def _assert_list_tasks_from_all_managers(
     rabbitmq_rpc_client: RabbitMQRPCClient,
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     task_context: TaskContext,
     task_count: int,
 ) -> None:
@@ -162,7 +162,7 @@ async def _assert_list_tasks_from_all_managers(
 
 async def _assert_task_is_no_longer_present(
     rabbitmq_rpc_client: RabbitMQRPCClient,
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     task_context: TaskContext,
     task_id: TaskId,
 ) -> None:
@@ -185,7 +185,7 @@ async def _assert_task_is_no_longer_present(
 @pytest.mark.parametrize("is_unique", _IS_UNIQUE)
 @pytest.mark.parametrize("to_return", [{"key": "value"}])
 async def test_workflow_with_result(
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     rabbitmq_rpc_client: RabbitMQRPCClient,
     task_count: int,
     is_unique: bool,
@@ -241,7 +241,7 @@ async def test_workflow_with_result(
 @pytest.mark.parametrize("task_context", _TASK_CONTEXT)
 @pytest.mark.parametrize("is_unique", _IS_UNIQUE)
 async def test_workflow_raises_error(
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     rabbitmq_rpc_client: RabbitMQRPCClient,
     task_count: int,
     is_unique: bool,
@@ -294,7 +294,7 @@ async def test_workflow_raises_error(
 @pytest.mark.parametrize("task_context", _TASK_CONTEXT)
 @pytest.mark.parametrize("is_unique", _IS_UNIQUE)
 async def test_remove_task(
-    long_running_managers: list[ServerLongRunningManager],
+    long_running_managers: list[LongRunningManager],
     rabbitmq_rpc_client: RabbitMQRPCClient,
     is_unique: bool,
     task_context: TaskContext | None,