Skip to content

Commit 64a0c4e

Browse files
remove duplicate
1 parent f7a6279 commit 64a0c4e

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

packages/celery-library/src/celery_library/models.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,3 @@ class TaskStatus(BaseModel):
8787
@property
8888
def is_done(self) -> bool:
8989
return self.task_state in _TASK_DONE
90-
91-
92-
TaskId: TypeAlias = str

packages/celery-library/src/celery_library/task.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from . import get_event_loop
1919
from .errors import encore_celery_transferrable_error
20-
from .models import TaskID, TaskId
20+
from .models import TaskID
2121
from .utils import get_fastapi_app
2222

2323
_logger = logging.getLogger(__name__)
@@ -145,7 +145,7 @@ def wrapper(task: AbortableTask, *args: P.args, **kwargs: P.kwargs) -> R:
145145
@overload
146146
def register_task(
147147
app: Celery,
148-
fn: Callable[Concatenate[AbortableTask, TaskId, P], Coroutine[Any, Any, R]],
148+
fn: Callable[Concatenate[AbortableTask, TaskID, P], Coroutine[Any, Any, R]],
149149
task_name: str | None = None,
150150
timeout: timedelta | None = _DEFAULT_TASK_TIMEOUT,
151151
max_retries: NonNegativeInt = _DEFAULT_MAX_RETRIES,
@@ -169,7 +169,7 @@ def register_task(
169169
def register_task( # type: ignore[misc]
170170
app: Celery,
171171
fn: (
172-
Callable[Concatenate[AbortableTask, TaskId, P], Coroutine[Any, Any, R]]
172+
Callable[Concatenate[AbortableTask, TaskID, P], Coroutine[Any, Any, R]]
173173
| Callable[Concatenate[AbortableTask, P], R]
174174
),
175175
task_name: str | None = None,

services/storage/src/simcore_service_storage/api/_worker_tasks/_files.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22

33
from celery import Task # type: ignore[import-untyped]
4-
from celery_library.models import TaskId
4+
from celery_library.models import TaskID
55
from celery_library.utils import get_fastapi_app
66
from models_library.api_schemas_storage.storage_schemas import (
77
FileUploadCompletionBody,
@@ -18,7 +18,7 @@
1818

1919
async def complete_upload_file(
2020
task: Task,
21-
task_id: TaskId,
21+
task_id: TaskID,
2222
user_id: UserID,
2323
location_id: LocationID,
2424
file_id: StorageFileID,

services/storage/src/simcore_service_storage/api/_worker_tasks/_paths.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from pathlib import Path
33

44
from celery import Task # type: ignore[import-untyped]
5-
from celery_library.models import TaskId
5+
from celery_library.models import TaskID
66
from celery_library.utils import get_fastapi_app
77
from models_library.projects_nodes_io import LocationID, StorageFileID
88
from models_library.users import UserID
@@ -17,7 +17,7 @@
1717

1818

1919
async def compute_path_size(
20-
task: Task, task_id: TaskId, user_id: UserID, location_id: LocationID, path: Path
20+
task: Task, task_id: TaskID, user_id: UserID, location_id: LocationID, path: Path
2121
) -> ByteSize:
2222
assert task_id # nosec
2323
with log_context(
@@ -31,7 +31,7 @@ async def compute_path_size(
3131

3232
async def delete_paths(
3333
task: Task,
34-
task_id: TaskId,
34+
task_id: TaskID,
3535
user_id: UserID,
3636
location_id: LocationID,
3737
paths: set[Path],

services/storage/src/simcore_service_storage/api/_worker_tasks/_simcore_s3.py

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

55
from aws_library.s3._models import S3ObjectKey
66
from celery import Task # type: ignore[import-untyped]
7-
from celery_library.models import TaskID, TaskId
7+
from celery_library.models import TaskID
88
from celery_library.utils import get_celery_worker, get_fastapi_app
99
from models_library.api_schemas_storage.storage_schemas import FoldersBody
1010
from models_library.api_schemas_webserver.storage import PathToExport
@@ -22,7 +22,7 @@
2222

2323

2424
async def _task_progress_cb(
25-
task: Task, task_id: TaskId, report: ProgressReport
25+
task: Task, task_id: TaskID, report: ProgressReport
2626
) -> None:
2727
worker = get_celery_worker(task.app)
2828
assert task.name # nosec
@@ -33,7 +33,7 @@ async def _task_progress_cb(
3333

3434

3535
async def deep_copy_files_from_project(
36-
task: Task, task_id: TaskId, user_id: UserID, body: FoldersBody
36+
task: Task, task_id: TaskID, user_id: UserID, body: FoldersBody
3737
) -> dict[str, Any]:
3838
with log_context(
3939
_logger,

0 commit comments

Comments
 (0)