Skip to content

Commit 6561be5

Browse files
author
Andrei Neagu
committed
mypy
1 parent fcd3e8a commit 6561be5

File tree

1 file changed

+27
-20
lines changed
  • packages/service-library/src/servicelib/long_running_tasks/_store

1 file changed

+27
-20
lines changed

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

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from settings_library.redis import RedisDatabase, RedisSettings
88

99
from ...redis._client import RedisClientSDK
10+
from ...redis._utils import handle_redis_returns_union_types
1011
from ..models import TaskContext, TaskData, TaskId
1112
from .base import BaseStore
1213

@@ -46,41 +47,47 @@ def _get_key(self, store_type: str, name: str) -> str:
4647
return f"{self.namespace}:{store_type}:{name}"
4748

4849
async def get_task_data(self, task_id: TaskId) -> TaskData | None:
49-
result: Any | None = await self._redis.hget(
50-
self._get_redis_hash_key(_STORE_TYPE_TASK_DATA), task_id
51-
) # type: ignore[misc]
50+
result: Any | None = await handle_redis_returns_union_types(
51+
self._redis.hget(self._get_redis_hash_key(_STORE_TYPE_TASK_DATA), task_id)
52+
)
5253
return TypeAdapter(TaskData).validate_json(result) if result else None
5354

5455
async def set_task_data(self, task_id: TaskId, value: TaskData) -> None:
5556
_logger.debug(
5657
"Setting task data for task_id=%s with data value=%s", task_id, value
5758
)
58-
await self._redis.hset(
59-
self._get_redis_hash_key(_STORE_TYPE_TASK_DATA),
60-
task_id,
61-
value.model_dump_json(),
62-
) # type: ignore[misc]
59+
await handle_redis_returns_union_types(
60+
self._redis.hset(
61+
self._get_redis_hash_key(_STORE_TYPE_TASK_DATA),
62+
task_id,
63+
value.model_dump_json(),
64+
)
65+
)
6366

6467
async def list_tasks_data(self) -> list[TaskData]:
65-
result: list[Any] = await self._redis.hvals(
66-
self._get_redis_hash_key(_STORE_TYPE_TASK_DATA)
67-
) # type: ignore[misc]
68+
result: list[Any] = await handle_redis_returns_union_types(
69+
self._redis.hvals(self._get_redis_hash_key(_STORE_TYPE_TASK_DATA))
70+
)
6871
return [TypeAdapter(TaskData).validate_json(item) for item in result]
6972

7073
async def delete_task_data(self, task_id: TaskId) -> None:
71-
await self._redis.hdel(self._get_redis_hash_key(_STORE_TYPE_TASK_DATA), task_id) # type: ignore[misc]
74+
await handle_redis_returns_union_types(
75+
self._redis.hdel(self._get_redis_hash_key(_STORE_TYPE_TASK_DATA), task_id)
76+
)
7277

7378
async def set_as_cancelled(
7479
self, task_id: TaskId, with_task_context: TaskContext
7580
) -> None:
76-
await self._redis.hset(
77-
self._get_redis_hash_key(_STORE_TYPE_CANCELLED_TASKS),
78-
task_id,
79-
json_dumps(with_task_context),
80-
) # type: ignore[misc]
81+
await handle_redis_returns_union_types(
82+
self._redis.hset(
83+
self._get_redis_hash_key(_STORE_TYPE_CANCELLED_TASKS),
84+
task_id,
85+
json_dumps(with_task_context),
86+
)
87+
)
8188

8289
async def get_cancelled(self) -> dict[TaskId, TaskContext]:
83-
result: dict[str, str | None] = await self._redis.hgetall(
84-
self._get_redis_hash_key(_STORE_TYPE_CANCELLED_TASKS)
85-
) # type: ignore[misc]
90+
result: dict[str, str | None] = await handle_redis_returns_union_types(
91+
self._redis.hgetall(self._get_redis_hash_key(_STORE_TYPE_CANCELLED_TASKS))
92+
)
8693
return {task_id: json_loads(context) for task_id, context in result.items()}

0 commit comments

Comments
 (0)