multiple fixes

Author: sanderegg

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

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from collections.abc import Callable
 from math import ceil
@@ -73,7 +72,7 @@ async def _request(
     except aiohttp.ClientResponseError as exc:
         raise _DatcoreAdapterResponseError(status=exc.status, reason=f"{exc}") from exc
 
-    except asyncio.TimeoutError as exc:
+    except TimeoutError as exc:
         msg = f"datcore-adapter server timed-out: {exc}"
         raise DatcoreAdapterTimeoutError(msg) from exc
 
@@ -122,7 +121,7 @@ async def check_service_health(app: web.Application) -> bool:
     session: ClientSession = get_client_session(app)
     try:
         await session.get(url, raise_for_status=True)
-    except (asyncio.TimeoutError, aiohttp.ClientError):
+    except (TimeoutError, aiohttp.ClientError):
         return False
     return True
 
@@ -187,7 +186,7 @@ async def list_all_files_metadatas_in_dataset(
         ),
     )
     return [
-        FileMetaData.construct(
+        FileMetaData.model_construct(
             file_uuid=d["path"],
             location_id=DATCORE_ID,
             location=DATCORE_STR,

services/storage/src/simcore_service_storage/handlers_health.py

@@ -31,13 +31,13 @@ async def get_health(request: web.Request) -> web.Response:
     assert request  # nosec
     return web.json_response(
         {
-            "data": HealthCheck.parse_obj(
+            "data": HealthCheck.model_validate(
                 {
                     "name": PROJECT_NAME,
                     "version": f"{VERSION}",
                     "api_version": API_VERSION,
                 }
-            ).dict(**RESPONSE_MODEL_POLICY)
+            ).model_dump(**RESPONSE_MODEL_POLICY)
         },
         dumps=json_dumps,
     )
@@ -69,7 +69,7 @@ async def get_status(request: web.Request) -> web.Response:
             "connected" if await is_pg_responsive(request.app) else "failed"
         )
 
-    status = AppStatusCheck.parse_obj(
+    status = AppStatusCheck.model_validate(
         {
             "app_name": PROJECT_NAME,
             "version": f"{VERSION}",
@@ -84,5 +84,5 @@ async def get_status(request: web.Request) -> web.Response:
     )
 
     return web.json_response(
-        {"data": status.dict(exclude_unset=True)}, dumps=json_dumps
+        {"data": status.model_dump(exclude_unset=True)}, dumps=json_dumps
     )

services/storage/src/simcore_service_storage/handlers_simcore_s3.py

@@ -53,7 +53,7 @@ async def get_or_create_temporary_s3_access(request: web.Request) -> web.Respons
     s3_settings: S3Settings = await sts.get_or_create_temporary_token_for_user(
         request.app, query_params.user_id
     )
-    return web.json_response({"data": s3_settings.dict()}, dumps=json_dumps)
+    return web.json_response({"data": s3_settings.model_dump()}, dumps=json_dumps)
 
 
 async def _copy_folders_from_project(

services/storage/src/simcore_service_storage/utils.py

@@ -16,7 +16,7 @@
 
 def convert_db_to_model(x: FileMetaDataAtDB) -> FileMetaData:
     model: FileMetaData = FileMetaData.parse_obj(
-        x.dict()
+        x.model_dump()
         | {
             "file_uuid": x.file_id,
             "file_name": x.file_id.split("/")[-1],