Merge branch 'master' into request/hide-osparc-integration

Author: odeimaiz

api/specs/web-server/_storage.py

@@ -8,6 +8,7 @@
 
 from fastapi import APIRouter, Query, status
 from models_library.api_schemas_storage import (
+    FileLocation,
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
     FileUploadCompleteResponse,
@@ -37,7 +38,7 @@
 
 @router.get(
     "/storage/locations",
-    response_model=list[DatasetMetaData],
+    response_model=list[FileLocation],
     description="Get available storage locations",
 )
 async def list_storage_locations():

services/storage/src/simcore_service_storage/modules/datcore_adapter/datcore_adapter.py

@@ -10,9 +10,9 @@
 from pydantic import AnyUrl, TypeAdapter
 from servicelib.fastapi.client_session import get_client_session
 from servicelib.utils import logged_gather
-from simcore_service_storage.core.settings import get_application_settings
 
 from ...constants import DATCORE_ID, DATCORE_STR, MAX_CONCURRENT_REST_CALLS
+from ...core.settings import get_application_settings
 from ...models import DatasetMetaData, FileMetaData
 from .datcore_adapter_exceptions import (
     DatcoreAdapterClientError,
@@ -64,7 +64,7 @@ async def _request(
             **request_kwargs,
         )
         response.raise_for_status()
-        response_data = await response.json()
+        response_data = response.json()
         assert isinstance(response_data, dict | list)  # nosec
         return response_data
 

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -5670,7 +5670,7 @@ paths:
             application/json:
               schema:
                 items:
-                  $ref: '#/components/schemas/DatasetMetaData'
+                  $ref: '#/components/schemas/FileLocation'
                 type: array
                 title: Response List Storage Locations
   /v0/storage/locations/{location_id}/datasets:
@@ -9296,6 +9296,20 @@ components:
       required:
       - date
       title: FeaturesDict
+    FileLocation:
+      properties:
+        name:
+          type: string
+          title: Name
+        id:
+          type: integer
+          title: Id
+      additionalProperties: false
+      type: object
+      required:
+      - name
+      - id
+      title: FileLocation
     FileMetaData:
       properties:
         file_uuid: