ongoing

Author: sanderegg

api/specs/storage/_datasets.py

@@ -1,72 +1,38 @@
-import logging
+from typing import Annotated
 
-from aiohttp import web
-from aiohttp.web import RouteTableDef
-from common_library.json_serialization import json_dumps
-from models_library.api_schemas_storage import FileMetaDataGet
-from models_library.utils.fastapi_encoders import jsonable_encoder
-from servicelib.aiohttp.requests_validation import (
-    parse_request_path_parameters_as,
-    parse_request_query_parameters_as,
-)
-
-# Exclusive for simcore-s3 storage -----------------------
-from ..._meta import API_VTAG
-from ...dsm import get_dsm_provider
-from ...models import (
-    FileMetaData,
-    FilesMetadataDatasetPathParams,
-    FilesMetadataDatasetQueryParams,
-    LocationPathParams,
-    StorageQueryParamsBase,
-)
+from fastapi import APIRouter, Depends
+from models_library.api_schemas_storage import DatasetMetaDataGet, FileMetaDataGet
+from models_library.generics import Envelope
+from simcore_service_storage._meta import API_VTAG
+from simcore_service_storage.models import FilesMetadataDatasetPathParams
 
-_logger = logging.getLogger(__name__)
+from api.specs.storage._locations import LocationPathParams, StorageQueryParamsBase
 
-routes = RouteTableDef()
+router = APIRouter(
+    prefix=f"/{API_VTAG}",
+    tags=[
+        "datasets",
+    ],
+)
 
 
-@routes.get(
-    f"/{API_VTAG}/locations/{{location_id}}/datasets", name="list_datasets_metadata"
+@router.get(
+    "/locations/{location_id}/datasets",
+    response_model=Envelope[list[DatasetMetaDataGet]],
 )
-async def list_datasets_metadata(request: web.Request) -> web.Response:
-    query_params: StorageQueryParamsBase = parse_request_query_parameters_as(
-        StorageQueryParamsBase, request
-    )
-    path_params = parse_request_path_parameters_as(LocationPathParams, request)
-    _logger.debug(
-        "received call to list_datasets_metadata with %s",
-        f"{path_params=}, {query_params=}",
-    )
-
-    dsm = get_dsm_provider(request.app).get(path_params.location_id)
-    return web.json_response(
-        {"data": await dsm.list_datasets(query_params.user_id)}, dumps=json_dumps
-    )
+async def list_datasets_metadata(
+    _query: Annotated[StorageQueryParamsBase, Depends()],
+    _path: Annotated[LocationPathParams, Depends()],
+):
+    ...
 
 
-@routes.get(
-    f"/{API_VTAG}/locations/{{location_id}}/datasets/{{dataset_id}}/metadata",
-    name="list_dataset_files_metadata",
+@router.get(
+    "/locations/{location_id}/datasets/{dataset_id}/metadata",
+    response_model=Envelope[list[FileMetaDataGet]],
 )
-async def list_dataset_files_metadata(request: web.Request) -> web.Response:
-    query_params: FilesMetadataDatasetQueryParams = parse_request_query_parameters_as(
-        FilesMetadataDatasetQueryParams, request
-    )
-    path_params = parse_request_path_parameters_as(
-        FilesMetadataDatasetPathParams, request
-    )
-    _logger.debug(
-        "received call to list_dataset_files_metadata with %s",
-        f"{path_params=}, {query_params=}",
-    )
-    dsm = get_dsm_provider(request.app).get(path_params.location_id)
-    data: list[FileMetaData] = await dsm.list_files_in_dataset(
-        user_id=query_params.user_id,
-        dataset_id=path_params.dataset_id,
-        expand_dirs=query_params.expand_dirs,
-    )
-    return web.json_response(
-        {"data": [jsonable_encoder(FileMetaDataGet(**d.model_dump())) for d in data]},
-        dumps=json_dumps,
-    )
+async def list_dataset_files_metadata(
+    _query: Annotated[FilesMetadataDatasetPathParams, Depends()],
+    _path: Annotated[LocationPathParams, Depends()],
+):
+    ...