Skip to content

Commit 2bb2a5e

Browse files
committed
fix tests
1 parent 08f659e commit 2bb2a5e

File tree

2 files changed

+11
-9
lines changed
  • packages/models-library/src/models_library/api_schemas_webserver
  • services/web/server/src/simcore_service_webserver/storage

2 files changed

+11
-9
lines changed

packages/models-library/src/models_library/api_schemas_webserver/storage.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ def from_job_id(cls, app: web.Application, job_id: str) -> "AsyncJobLinks":
6565
)
6666

6767

68-
class StorageAsyncJobId(InputSchema):
69-
job_id: AsyncJobId
70-
71-
7268
class StorageAsyncJobGet(OutputSchema):
7369
job_id: AsyncJobId
7470
links: AsyncJobLinks

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
from urllib.parse import quote, unquote
1010

1111
from aiohttp import ClientTimeout, web
12-
from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobNameData
12+
from models_library.api_schemas_rpc_async_jobs.async_jobs import (
13+
AsyncJobId,
14+
AsyncJobNameData,
15+
)
1316
from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
1417
from models_library.api_schemas_storage.storage_schemas import (
1518
FileUploadCompleteResponse,
@@ -20,7 +23,6 @@
2023
from models_library.api_schemas_webserver.storage import (
2124
DataExportPost,
2225
StorageAsyncJobGet,
23-
StorageAsyncJobId,
2426
StorageAsyncJobResult,
2527
StorageAsyncJobStatus,
2628
)
@@ -469,6 +471,10 @@ async def get_async_jobs(request: web.Request) -> web.Response:
469471
)
470472

471473

474+
class _StorageAsyncJobId(BaseModel):
475+
job_id: AsyncJobId
476+
477+
472478
@routes.get(
473479
_storage_prefix + "/async-jobs/{job_id}/status",
474480
name="get_async_job_status",
@@ -480,7 +486,7 @@ async def get_async_job_status(request: web.Request) -> web.Response:
480486
_req_ctx = RequestContext.model_validate(request)
481487
rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
482488

483-
async_job_get = parse_request_path_parameters_as(StorageAsyncJobId, request)
489+
async_job_get = parse_request_path_parameters_as(_StorageAsyncJobId, request)
484490
async_job_rpc_status = await get_status(
485491
rabbitmq_rpc_client=rabbitmq_rpc_client,
486492
rpc_namespace=STORAGE_RPC_NAMESPACE,
@@ -508,7 +514,7 @@ async def abort_async_job(request: web.Request) -> web.Response:
508514
_req_ctx = RequestContext.model_validate(request)
509515

510516
rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
511-
async_job_get = parse_request_path_parameters_as(StorageAsyncJobId, request)
517+
async_job_get = parse_request_path_parameters_as(_StorageAsyncJobId, request)
512518
async_job_rpc_abort = await abort(
513519
rabbitmq_rpc_client=rabbitmq_rpc_client,
514520
rpc_namespace=STORAGE_RPC_NAMESPACE,
@@ -537,7 +543,7 @@ async def get_async_job_result(request: web.Request) -> web.Response:
537543
_req_ctx = RequestContext.model_validate(request)
538544

539545
rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
540-
async_job_get = parse_request_path_parameters_as(StorageAsyncJobId, request)
546+
async_job_get = parse_request_path_parameters_as(_StorageAsyncJobId, request)
541547
async_job_rpc_result = await get_result(
542548
rabbitmq_rpc_client=rabbitmq_rpc_client,
543549
rpc_namespace=STORAGE_RPC_NAMESPACE,

0 commit comments

Comments
 (0)