Skip to content

Commit 8ce988a

Browse files
author
Andrei Neagu
committed
removed unsued module
1 parent 4224e13 commit 8ce988a

File tree

5 files changed

+11
-65
lines changed

5 files changed

+11
-65
lines changed

packages/service-library/src/servicelib/long_running_tasks/_store/redis.py renamed to packages/service-library/src/servicelib/long_running_tasks/_redis_store.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
from pydantic import TypeAdapter
77
from settings_library.redis import RedisDatabase, RedisSettings
88

9-
from ...redis._client import RedisClientSDK
10-
from ...redis._utils import handle_redis_returns_union_types
11-
from ...utils import limited_gather
12-
from ..models import TaskContext, TaskData, TaskId
13-
from .base import BaseStore
9+
from ..redis._client import RedisClientSDK
10+
from ..redis._utils import handle_redis_returns_union_types
11+
from ..utils import limited_gather
12+
from .models import TaskContext, TaskData, TaskId
1413

1514
_STORE_TYPE_TASK_DATA: Final[str] = "TD"
1615
_STORE_TYPE_CANCELLED_TASKS: Final[str] = "CT"
@@ -27,7 +26,7 @@ def _decode_dict(data: dict[str, str]) -> dict[str, Any]:
2726
return {k: json.loads(v) for k, v in data.items()}
2827

2928

30-
class RedisStore(BaseStore):
29+
class RedisStore:
3130
def __init__(self, redis_settings: RedisSettings, namespace: str):
3231
self.redis_settings = redis_settings
3332
self.namespace = namespace.upper()

packages/service-library/src/servicelib/long_running_tasks/_store/__init__.py

Whitespace-only changes.

packages/service-library/src/servicelib/long_running_tasks/_store/base.py

Lines changed: 0 additions & 51 deletions
This file was deleted.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
from ..background_task import create_periodic_task
2424
from ..logging_utils import log_catch
2525
from ..redis import RedisClientSDK, exclusive
26+
from ._redis_store import RedisStore
2627
from ._serialization import object_to_string, string_to_object
27-
from ._store.base import BaseStore
28-
from ._store.redis import RedisStore
2928
from .errors import (
3029
TaskAlreadyRunningError,
3130
TaskCancelledError,
@@ -81,7 +80,7 @@ def unregister(cls, task: TaskProtocol) -> None:
8180

8281

8382
async def _get_tasks_to_remove(
84-
tracked_tasks: BaseStore,
83+
tracked_tasks: RedisStore,
8584
stale_task_detect_timeout_s: PositiveFloat,
8685
) -> list[tuple[TaskId, TaskContext]]:
8786
utc_now = datetime.datetime.now(tz=datetime.UTC)
@@ -122,7 +121,7 @@ def __init__(
122121
lrt_namespace: LRTNamespace,
123122
):
124123
# Task groups: Every taskname maps to multiple asyncio.Task within TrackedTask model
125-
self._tasks_data: BaseStore = RedisStore(redis_settings, lrt_namespace)
124+
self._tasks_data = RedisStore(redis_settings, lrt_namespace)
126125
self._created_tasks: dict[TaskId, asyncio.Task] = {}
127126

128127
self.stale_task_check_interval = stale_task_check_interval

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import pytest
77
from pydantic import TypeAdapter
8-
from servicelib.long_running_tasks._store.base import BaseStore
9-
from servicelib.long_running_tasks._store.redis import RedisStore
8+
from servicelib.long_running_tasks._redis_store import RedisStore
109
from servicelib.long_running_tasks.models import TaskData
1110
from servicelib.redis._client import RedisClientSDK
1211
from settings_library.redis import RedisDatabase, RedisSettings
@@ -25,7 +24,7 @@ async def store(
2524
get_redis_client_sdk: Callable[
2625
[RedisDatabase], AbstractAsyncContextManager[RedisClientSDK]
2726
],
28-
) -> AsyncIterable[BaseStore]:
27+
) -> AsyncIterable[RedisStore]:
2928
store = RedisStore(redis_settings=use_in_memory_redis, namespace="test")
3029

3130
await store.setup()
@@ -37,7 +36,7 @@ async def store(
3736
pass
3837

3938

40-
async def test_workflow(store: BaseStore, task_data: TaskData) -> None:
39+
async def test_workflow(store: RedisStore, task_data: TaskData) -> None:
4140
# task data
4241
assert await store.list_tasks_data() == []
4342
assert await store.get_task_data("missing") is None

0 commit comments

Comments
 (0)