refactor positions

Author: Andrei Neagu

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

@@ -6,8 +6,8 @@
     ResultModel,
     StartParams,
 )
-from ._rpc.server import BaseServerJobInterface
 from ._server import Server
+from .runners.base import BaseServerJobInterface
 
 __all__ = (
     "BaseServerJobInterface",

packages/service-library/src/servicelib/long_running_interfaces/_rpc/server.py

@@ -1,7 +1,5 @@
 import traceback
-from abc import ABC, abstractmethod
 from datetime import timedelta
-from typing import Any
 
 from servicelib.rabbitmq import RPCRouter
 from settings_library.rabbit import RabbitSettings
@@ -17,39 +15,10 @@
     ResultModel,
     StartParams,
 )
+from ..runners.base import BaseServerJobInterface
 from ._utils import get_rpc_namespace
 
 
-class BaseServerJobInterface(ABC):
-    """allows the server side jobs to be implemented however the user pleases"""
-
-    @abstractmethod
-    async def start(
-        self,
-        name: RemoteHandlerName,
-        unique_id: JobUniqueId,
-        params: StartParams,
-        timeout: timedelta,  # noqa: ASYNC109
-    ) -> None:
-        """used to start a job"""
-
-    @abstractmethod
-    async def remove(self, unique_id: JobUniqueId) -> None:
-        """aborts and removes a job"""
-
-    @abstractmethod
-    async def is_present(self, unique_id: JobUniqueId) -> bool:
-        """returns True if the job exists"""
-
-    @abstractmethod
-    async def is_running(self, unique_id: JobUniqueId) -> bool:
-        """returns True if the job is currently running"""
-
-    @abstractmethod
-    async def get_result(self, unique_id: JobUniqueId) -> Any | None:
-        """provides the result of the job once finished"""
-
-
 class ServerRPCInterface:
     def __init__(
         self,

packages/service-library/src/servicelib/long_running_interfaces/_server.py

@@ -1,7 +1,8 @@
 from settings_library.rabbit import RabbitSettings
 
 from ._models import LongRunningNamespace
-from ._rpc.server import BaseServerJobInterface, ServerRPCInterface
+from ._rpc.server import ServerRPCInterface
+from .runners.base import BaseServerJobInterface
 
 
 class Server:

packages/service-library/src/servicelib/long_running_interfaces_runners/__init__.py renamed to packages/service-library/src/servicelib/long_running_interfaces/runners/__init__.py

@@ -5,13 +5,9 @@
 
 from pydantic import NonNegativeFloat
 
-from ...async_utils import cancel_wait_task
-from ...long_running_interfaces import (
-    BaseServerJobInterface,
-    JobUniqueId,
-    RemoteHandlerName,
-    StartParams,
-)
+from ....async_utils import cancel_wait_task
+from ..._models import JobUniqueId, RemoteHandlerName, StartParams
+from ...runners.base import BaseServerJobInterface
 from ._errors import HandlerNotRegisteredError, TaskNotFoundError
 from ._registry import AsyncTaskRegistry
 

packages/service-library/src/servicelib/long_running_interfaces_runners/asyncio_tasks/__init__.py renamed to packages/service-library/src/servicelib/long_running_interfaces/runners/asyncio_tasks/__init__.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable
 from typing import Any, Self, TypeVar
 
-from ...long_running_interfaces import RemoteHandlerName
+from ..._models import RemoteHandlerName
 
 DecoratedCallable = TypeVar("DecoratedCallable", bound=Callable[..., Any])
 

packages/service-library/src/servicelib/long_running_interfaces_runners/asyncio_tasks/_core.py renamed to packages/service-library/src/servicelib/long_running_interfaces/runners/asyncio_tasks/_core.py

@@ -0,0 +1,35 @@
+from abc import ABC, abstractmethod
+from datetime import timedelta
+from typing import Any
+
+from .._models import JobUniqueId, RemoteHandlerName, StartParams
+
+
+class BaseServerJobInterface(ABC):
+    """allows the server side jobs to be implemented however the user pleases"""
+
+    @abstractmethod
+    async def start(
+        self,
+        name: RemoteHandlerName,
+        unique_id: JobUniqueId,
+        params: StartParams,
+        timeout: timedelta,  # noqa: ASYNC109
+    ) -> None:
+        """used to start a job"""
+
+    @abstractmethod
+    async def remove(self, unique_id: JobUniqueId) -> None:
+        """aborts and removes a job"""
+
+    @abstractmethod
+    async def is_present(self, unique_id: JobUniqueId) -> bool:
+        """returns True if the job exists"""
+
+    @abstractmethod
+    async def is_running(self, unique_id: JobUniqueId) -> bool:
+        """returns True if the job is currently running"""
+
+    @abstractmethod
+    async def get_result(self, unique_id: JobUniqueId) -> Any | None:
+        """provides the result of the job once finished"""