fixed issue when converting model

Author: sanderegg

services/storage/src/simcore_service_storage/handlers_datasets.py

@@ -69,6 +69,6 @@ async def get_files_metadata_dataset(request: web.Request) -> web.Response:
         expand_dirs=query_params.expand_dirs,
     )
     return web.json_response(
-        {"data": [jsonable_encoder(FileMetaDataGet.model_validate(d)) for d in data]},
+        {"data": [jsonable_encoder(FileMetaDataGet(**d.model_dump())) for d in data]},
         dumps=json_dumps,
     )

services/storage/src/simcore_service_storage/handlers_files.py

@@ -72,7 +72,7 @@ async def get_files_metadata(request: web.Request) -> web.Response:
         project_id=query_params.project_id,
     )
     return web.json_response(
-        {"data": [jsonable_encoder(FileMetaDataGet.model_validate(d)) for d in data]},
+        {"data": [jsonable_encoder(FileMetaDataGet(**d.model_dump())) for d in data]},
         dumps=json_dumps,
     )
 
@@ -87,7 +87,7 @@ async def get_file_metadata(request: web.Request) -> web.Response:
     )
     path_params = parse_request_path_parameters_as(FilePathParams, request)
     log.debug(
-        "received call to get_files_metadata_dataset with %s",
+        "received call to get_file_metadata_dataset with %s",
         f"{path_params=}, {query_params=}",
     )
 
@@ -134,7 +134,10 @@ async def get_file_metadata(request: web.Request) -> web.Response:
             dumps=json_dumps,
         )
 
-    return jsonable_encoder(FileMetaDataGet.model_validate(data))  # type: ignore[no-any-return] # middleware takes care of enveloping
+    return web.json_response(
+        {"data": jsonable_encoder(FileMetaDataGet(**data.model_dump()))},
+        dumps=json_dumps,
+    )
 
 
 @routes.get(
@@ -408,4 +411,4 @@ async def copy_as_soft_link(request: web.Request):
         query_params.user_id, path_params.file_id, body.link_id
     )
 
-    return jsonable_encoder(FileMetaDataGet.model_validate(file_link))
+    return jsonable_encoder(FileMetaDataGet(**file_link.model_dump()))

services/storage/src/simcore_service_storage/handlers_simcore_s3.py

@@ -160,6 +160,6 @@ async def search_files(request: web.Request) -> web.Response:
     )
 
     return web.json_response(
-        {"data": [jsonable_encoder(FileMetaDataGet.model_validate(d)) for d in data]},
+        {"data": [jsonable_encoder(FileMetaDataGet(**d.model_dump())) for d in data]},
         dumps=json_dumps,
     )