remove pydantic

Author: giancarloromeo

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

@@ -54,7 +54,7 @@ async def submit_task(
             self._celery_app.send_task(
                 task_metadata.name,
                 task_id=task_id,
-                kwargs=task_params,
+                kwargs={"task_id": task_id} | task_params,
                 queue=task_metadata.queue.value,
             )
 

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

@@ -40,11 +40,11 @@ class TaskAbortedError(Exception): ...
 def _async_task_wrapper(
     app: Celery,
 ) -> Callable[
-    [Callable[Concatenate[AbortableTask, TaskId, P], Coroutine[Any, Any, R]]],
+    [Callable[Concatenate[AbortableTask, P], Coroutine[Any, Any, R]]],
     Callable[Concatenate[AbortableTask, P], R],
 ]:
     def decorator(
-        coro: Callable[Concatenate[AbortableTask, TaskId, P], Coroutine[Any, Any, R]],
+        coro: Callable[Concatenate[AbortableTask, P], Coroutine[Any, Any, R]],
     ) -> Callable[Concatenate[AbortableTask, P], R]:
         @wraps(coro)
         def wrapper(task: AbortableTask, *args: P.args, **kwargs: P.kwargs) -> R:
@@ -56,7 +56,7 @@ async def run_task(task_id: TaskID) -> R:
                 try:
                     async with asyncio.TaskGroup() as tg:
                         main_task = tg.create_task(
-                            coro(task, task_id, *args, **kwargs),
+                            coro(task, *args, **kwargs),
                         )
 
                         async def abort_monitor():
@@ -205,4 +205,5 @@ def register_task(  # type: ignore[misc]
         bind=True,
         base=AbortableTask,
         time_limit=None if timeout is None else timeout.total_seconds(),
+        pydantic=True,
     )(wrapped_fn)

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

@@ -2,15 +2,10 @@
 
 from celery import Celery  # type: ignore[import-untyped]
 from celery_library.task import register_task
-from celery_library.types import register_celery_types, register_pydantic_types
+from celery_library.types import register_celery_types
 from models_library.api_schemas_storage.export_data_async_jobs import AccessRightError
-from models_library.api_schemas_storage.storage_schemas import (
-    FileUploadCompletionBody,
-    FoldersBody,
-)
 from servicelib.logging_utils import log_context
 
-from ...models import FileMetaData
 from ._files import complete_upload_file
 from ._paths import compute_path_size, delete_paths
 from ._simcore_s3 import deep_copy_files_from_project, export_data
@@ -21,8 +16,6 @@
 def setup_worker_tasks(app: Celery) -> None:
     register_celery_types()
 
-    register_pydantic_types(FileUploadCompletionBody, FileMetaData, FoldersBody)
-
     with log_context(_logger, logging.INFO, msg="worker task registration"):
         register_task(app, export_data, dont_autoretry_for=(AccessRightError,))
         register_task(app, compute_path_size)

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

@@ -292,7 +292,7 @@ async def complete_upload_file(
         user_id=async_job_name_data.user_id,
         location_id=location_id,
         file_id=file_id,
-        body=body,
+        body=body.model_dump(),
     )
 
     route = (
@@ -353,7 +353,8 @@ async def is_completed_upload_file(
         assert new_fmd.location_id == location_id  # nosec
         assert new_fmd.file_id == file_id  # nosec
         response = FileUploadCompleteFutureResponse(
-            state=FileUploadCompleteState.OK, e_tag=new_fmd.entity_tag
+            state=FileUploadCompleteState.OK,
+            e_tag=FileMetaData.model_validate(new_fmd).entity_tag,
         )
     else:
         # the task is still running