Skip to content

Commit bf6af2d

Browse files
move forget
1 parent eda9e7f commit bf6af2d

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

services/storage/src/simcore_service_storage/modules/celery/backends/_redis.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
from datetime import timedelta
33
from typing import Final
44

5-
from celery.result import AsyncResult # type: ignore[import-untyped]
6-
from common_library.async_tools import make_async
75
from models_library.progress_bar import ProgressReport
86
from servicelib.redis._client import RedisClientSDK
97

@@ -97,14 +95,8 @@ async def list_tasks(self, task_context: TaskContext) -> list[Task]:
9795
if metadata is not None
9896
]
9997

100-
@make_async()
101-
@staticmethod
102-
def _forget_task(task_id: TaskID) -> None:
103-
AsyncResult(task_id).forget()
104-
10598
async def remove_task(self, task_id: TaskID) -> None:
10699
await self._redis_client_sdk.redis.delete(_build_key(task_id))
107-
await self._forget_task(task_id)
108100

109101
async def set_task_progress(self, task_id: TaskID, report: ProgressReport) -> None:
110102
await self._redis_client_sdk.redis.hset(

services/storage/src/simcore_service_storage/modules/celery/client.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from .models import (
1616
Task,
1717
TaskContext,
18+
TaskID,
1819
TaskInfoStore,
1920
TaskMetadata,
2021
TaskState,
@@ -79,6 +80,10 @@ async def abort_task(self, task_context: TaskContext, task_uuid: TaskUUID) -> No
7980
):
8081
await self._abort_task(task_context, task_uuid)
8182

83+
@make_async()
84+
async def _forget_task(self, task_id: TaskID) -> None:
85+
AbortableAsyncResult(task_id, app=self._celery_app).forget()
86+
8287
async def get_task_result(
8388
self, task_context: TaskContext, task_uuid: TaskUUID
8489
) -> Any:
@@ -94,6 +99,7 @@ async def get_task_result(
9499
task_metadata = await self._task_store.get_task_metadata(task_id)
95100
if task_metadata is not None and task_metadata.ephemeral:
96101
await self._task_store.remove_task(task_id)
102+
await self._forget_task(task_id)
97103
return result
98104

99105
async def _get_task_progress_report(

0 commit comments

Comments
 (0)