Skip to content

Commit d030517

Browse files
fix: remove rpc routes
1 parent add0184 commit d030517

File tree

4 files changed

+8
-27
lines changed

4 files changed

+8
-27
lines changed

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@
22

33
from celery import Celery # type: ignore[import-untyped]
44
from celery_library.task import register_task
5-
from celery_library.types import register_celery_types, register_pydantic_types
5+
from celery_library.types import register_celery_types
66
from models_library.api_schemas_storage.export_data_async_jobs import AccessRightError
7-
from models_library.api_schemas_storage.storage_schemas import (
8-
FileUploadCompletionBody,
9-
FoldersBody,
10-
PresignedLink,
11-
)
127
from servicelib.logging_utils import log_context
138

14-
from ...models import FileMetaData
159
from ._files import complete_upload_file
1610
from ._paths import compute_path_size, delete_paths
1711
from ._simcore_s3 import (
@@ -26,11 +20,8 @@
2620

2721
def setup_worker_tasks(app: Celery) -> None:
2822
register_celery_types()
29-
register_pydantic_types(
30-
FileUploadCompletionBody, FileMetaData, FoldersBody, PresignedLink
31-
)
3223

33-
with log_context(_logger, logging.INFO, msg="worker task registration"):
24+
with log_context(_logger, logging.INFO, msg="worker tasks registration"):
3425
register_task(app, export_data, dont_autoretry_for=(AccessRightError,))
3526
register_task(
3627
app, export_data_as_download_link, dont_autoretry_for=(AccessRightError,)

services/storage/src/simcore_service_storage/api/rpc/routes.py

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

3-
from celery_library.rpc import _async_jobs
43
from fastapi import FastAPI
54
from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
65
from servicelib.logging_utils import log_context
@@ -14,7 +13,6 @@
1413

1514

1615
ROUTERS: list[RPCRouter] = [
17-
_async_jobs.router,
1816
_paths.router,
1917
_simcore_s3.router,
2018
]

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,13 @@
33
from celery_library.backends.redis import RedisTaskInfoStore
44
from celery_library.common import create_app
55
from celery_library.task_manager import CeleryTaskManager
6-
from celery_library.types import register_celery_types, register_pydantic_types
6+
from celery_library.types import register_celery_types
77
from fastapi import FastAPI
8-
from models_library.api_schemas_storage.search_async_jobs import SearchResult
9-
from models_library.api_schemas_storage.storage_schemas import (
10-
FileUploadCompletionBody,
11-
FoldersBody,
12-
)
138
from servicelib.logging_utils import log_context
149
from servicelib.redis import RedisClientSDK
1510
from settings_library.celery import CelerySettings
1611
from settings_library.redis import RedisDatabase
1712

18-
from ...models import FileMetaData
19-
2013
_logger = logging.getLogger(__name__)
2114

2215

@@ -39,7 +32,6 @@ async def on_startup() -> None:
3932
)
4033

4134
register_celery_types()
42-
register_pydantic_types(FileUploadCompletionBody, FileMetaData, FoldersBody, SearchResult)
4335

4436
async def on_shutdown() -> None:
4537
with log_context(_logger, logging.INFO, "Shutting down Celery"):

services/web/server/src/simcore_service_webserver/tasks/_rest.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async def get_async_jobs(request: web.Request) -> web.Response:
7676
get_job_filter(
7777
user_id=_req_ctx.user_id,
7878
product_name=_req_ctx.product_name,
79-
)
79+
).model_dump(),
8080
)
8181
)
8282

@@ -119,7 +119,7 @@ async def get_async_job_status(request: web.Request) -> web.Response:
119119
get_job_filter(
120120
user_id=_req_ctx.user_id,
121121
product_name=_req_ctx.product_name,
122-
)
122+
).model_dump(),
123123
),
124124
task_uuid=path_params.task_id,
125125
)
@@ -153,7 +153,7 @@ async def cancel_async_job(request: web.Request) -> web.Response:
153153
get_job_filter(
154154
user_id=_req_ctx.user_id,
155155
product_name=_req_ctx.product_name,
156-
)
156+
).model_dump(),
157157
),
158158
task_uuid=path_params.task_id,
159159
)
@@ -177,7 +177,7 @@ async def get_async_job_result(request: web.Request) -> web.Response:
177177
get_job_filter(
178178
user_id=_req_ctx.user_id,
179179
product_name=_req_ctx.product_name,
180-
)
180+
).model_dump(),
181181
),
182182
task_uuid=path_params.task_id,
183183
)
@@ -206,7 +206,7 @@ async def event_generator():
206206
get_job_filter(
207207
user_id=_req_ctx.user_id,
208208
product_name=_req_ctx.product_name,
209-
)
209+
).model_dump(),
210210
),
211211
task_uuid=path_params.task_id,
212212
last_id=header_params.last_event_id,

0 commit comments

Comments
 (0)