continue fixing

Author: giancarloromeo

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/errors.py

@@ -1,8 +1,8 @@
 from typing import Any
 
 from fastapi import status
+from models_library.errors_classes import OsparcErrorMixin
 from models_library.services import RunID
-from pydantic.errors import PydanticErrorMixin
 
 
 class BaseDynamicSidecarError(Exception):
@@ -35,7 +35,7 @@ def __init__(self, message: str, status_code: int) -> None:
         )
 
 
-class BaseError(PydanticErrorMixin, BaseDynamicSidecarError):
+class BaseError(OsparcErrorMixin, BaseDynamicSidecarError):
     code = "dy_sidecar.error"
 
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/user_services_preferences/_errors.py

@@ -1,7 +1,7 @@
-from pydantic.errors import PydanticErrorMixin
+from models_library.errors_classes import OsparcErrorMixin
 
 
-class BaseServicesPreferencesError(PydanticErrorMixin, Exception):
+class BaseServicesPreferencesError(OsparcErrorMixin, Exception):
     code = "dynamic_sidecar.user_service_preferences"
 
 

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/user_services_preferences/_packaging.py

@@ -2,13 +2,15 @@
 from typing import Final
 
 import aiofiles
-from pydantic import ByteSize, parse_obj_as
+from pydantic import ByteSize, TypeAdapter
 from servicelib.archiving_utils import archive_dir, unarchive_dir
 from servicelib.file_utils import remove_directory
 
 from ._errors import DestinationIsNotADirectoryError, PreferencesAreTooBigError
 
-_MAX_PREFERENCES_TOTAL_SIZE: Final[ByteSize] = parse_obj_as(ByteSize, "128kib")
+_MAX_PREFERENCES_TOTAL_SIZE: Final[ByteSize] = TypeAdapter(ByteSize).validate_python(
+    "128kib"
+)
 
 
 async def dir_to_bytes(source: Path) -> bytes: