Typed style deserializers

Author: p1c2u

openapi_core/casting/schemas/exceptions.py

@@ -1,11 +1,11 @@
 from dataclasses import dataclass
 from typing import Any
 
-from openapi_core.exceptions import OpenAPIError
+from openapi_core.deserializing.exceptions import DeserializeError
 
 
 @dataclass
-class CastError(OpenAPIError):
+class CastError(DeserializeError):
     """Schema cast operation error"""
 
     value: Any

openapi_core/deserializing/media_types/__init__.py

@@ -12,9 +12,8 @@
 from openapi_core.deserializing.media_types.util import plain_loads
 from openapi_core.deserializing.media_types.util import urlencoded_form_loads
 from openapi_core.deserializing.media_types.util import xml_loads
-from openapi_core.deserializing.styles import style_deserializers_factory
 
-__all__ = ["media_type_deserializers_factory"]
+__all__ = ["media_type_deserializers", "MediaTypeDeserializersFactory"]
 
 media_type_deserializers: MediaTypeDeserializersDict = defaultdict(
     lambda: binary_loads,
@@ -30,8 +29,3 @@
         "multipart/form-data": data_form_loads,
     }
 )
-
-media_type_deserializers_factory = MediaTypeDeserializersFactory(
-    style_deserializers_factory,
-    media_type_deserializers=media_type_deserializers,
-)

openapi_core/deserializing/media_types/factories.py

@@ -12,6 +12,7 @@
 from openapi_core.deserializing.media_types.deserializers import (
     MediaTypesDeserializer,
 )
+from openapi_core.deserializing.styles.datatypes import StyleDeserializersDict
 from openapi_core.deserializing.styles.factories import (
     StyleDeserializersFactory,
 )
@@ -28,6 +29,31 @@ def __init__(
             media_type_deserializers = {}
         self.media_type_deserializers = media_type_deserializers
 
+    @classmethod
+    def from_schema_casters_factory(
+        cls,
+        schema_casters_factory: StyleDeserializersFactory,
+        style_deserializers: StyleDeserializersDict = None,
+        media_type_deserializers: Optional[MediaTypeDeserializersDict] = None,
+    ) -> "MediaTypeDeserializersFactory":
+        from openapi_core.deserializing.media_types import (
+            media_type_deserializers as default_media_type_deserializers,
+        )
+        from openapi_core.deserializing.styles import (
+            style_deserializers as default_style_deserializers,
+        )
+
+        style_deserializers_factory = StyleDeserializersFactory(
+            schema_casters_factory,
+            style_deserializers=style_deserializers
+            or default_style_deserializers,
+        )
+        return cls(
+            style_deserializers_factory,
+            media_type_deserializers=media_type_deserializers
+            or default_media_type_deserializers,
+        )
+
     def create(
         self,
         mimetype: str,

openapi_core/deserializing/styles/__init__.py

@@ -10,7 +10,7 @@
 from openapi_core.deserializing.styles.util import simple_loads
 from openapi_core.deserializing.styles.util import space_delimited_loads
 
-__all__ = ["style_deserializers_factory"]
+__all__ = ["style_deserializers", "StyleDeserializersFactory"]
 
 style_deserializers: StyleDeserializersDict = {
     "matrix": matrix_loads,
@@ -21,7 +21,3 @@
     "pipeDelimited": pipe_delimited_loads,
     "deepObject": deep_object_loads,
 }
-
-style_deserializers_factory = StyleDeserializersFactory(
-    style_deserializers=style_deserializers,
-)

openapi_core/deserializing/styles/datatypes.py

@@ -3,5 +3,9 @@
 from typing import Dict
 from typing import Mapping
 
-DeserializerCallable = Callable[[bool, str, str, Mapping[str, Any]], Any]
+from jsonschema_path import SchemaPath
+
+DeserializerCallable = Callable[
+    [bool, str, SchemaPath, Mapping[str, Any], bool], Any
+]
 StyleDeserializersDict = Dict[str, DeserializerCallable]

openapi_core/deserializing/styles/deserializers.py

@@ -3,6 +3,10 @@
 from typing import Mapping
 from typing import Optional
 
+from jsonschema_path import SchemaPath
+
+from openapi_core.casting.schemas.casters import SchemaCaster
+from openapi_core.casting.schemas.exceptions import CastError
 from openapi_core.deserializing.exceptions import DeserializeError
 from openapi_core.deserializing.styles.datatypes import DeserializerCallable
 
@@ -13,13 +17,16 @@ def __init__(
         style: str,
         explode: bool,
         name: str,
-        schema_type: str,
+        schema: SchemaPath,
+        caster: SchemaCaster,
         deserializer_callable: Optional[DeserializerCallable] = None,
     ):
         self.style = style
         self.explode = explode
         self.name = name
-        self.schema_type = schema_type
+        self.schema = schema
+        self.schema_type = schema.getkey("type", "")
+        self.caster = caster
         self.deserializer_callable = deserializer_callable
 
     def deserialize(self, location: Mapping[str, Any]) -> Any:
@@ -28,8 +35,13 @@ def deserialize(self, location: Mapping[str, Any]) -> Any:
             return location[self.name]
 
         try:
-            return self.deserializer_callable(
+            value = self.deserializer_callable(
                 self.explode, self.name, self.schema_type, location
             )
-        except (ValueError, TypeError, AttributeError):
-            raise DeserializeError(self.style, self.name)
+        except (ValueError, TypeError, AttributeError) as exc:
+            raise DeserializeError(self.style, self.name) from exc
+
+        try:
+            return self.caster.cast(value)
+        except (ValueError, TypeError, AttributeError) as exc:
+            raise CastError(value, self.schema_type) from exc

openapi_core/deserializing/styles/factories.py

@@ -2,15 +2,18 @@
 
 from jsonschema_path import SchemaPath
 
+from openapi_core.casting.schemas.factories import SchemaCastersFactory
 from openapi_core.deserializing.styles.datatypes import StyleDeserializersDict
 from openapi_core.deserializing.styles.deserializers import StyleDeserializer
 
 
 class StyleDeserializersFactory:
     def __init__(
         self,
+        schema_casters_factory: SchemaCastersFactory,
         style_deserializers: Optional[StyleDeserializersDict] = None,
     ):
+        self.schema_casters_factory = schema_casters_factory
         if style_deserializers is None:
             style_deserializers = {}
         self.style_deserializers = style_deserializers
@@ -22,9 +25,8 @@ def create(
         schema: SchemaPath,
         name: str,
     ) -> StyleDeserializer:
-        schema_type = schema.getkey("type", "")
-
         deserialize_callable = self.style_deserializers.get(style)
+        caster = self.schema_casters_factory.create(schema)
         return StyleDeserializer(
-            style, explode, name, schema_type, deserialize_callable
+            style, explode, name, schema, caster, deserialize_callable
         )

openapi_core/unmarshalling/request/protocols.py

@@ -8,16 +8,12 @@
 from openapi_spec_validator.validation.types import SpecValidatorType
 
 from openapi_core.casting.schemas.factories import SchemaCastersFactory
-from openapi_core.deserializing.media_types import (
-    media_type_deserializers_factory,
-)
 from openapi_core.deserializing.media_types.datatypes import (
     MediaTypeDeserializersDict,
 )
 from openapi_core.deserializing.media_types.factories import (
     MediaTypeDeserializersFactory,
 )
-from openapi_core.deserializing.styles import style_deserializers_factory
 from openapi_core.deserializing.styles.factories import (
     StyleDeserializersFactory,
 )
@@ -43,8 +39,8 @@ def __init__(
         self,
         spec: SchemaPath,
         base_url: Optional[str] = None,
-        style_deserializers_factory: StyleDeserializersFactory = style_deserializers_factory,
-        media_type_deserializers_factory: MediaTypeDeserializersFactory = media_type_deserializers_factory,
+        style_deserializers_factory: StyleDeserializersFactory = None,
+        media_type_deserializers_factory: MediaTypeDeserializersFactory = None,
         schema_casters_factory: Optional[SchemaCastersFactory] = None,
         schema_validators_factory: Optional[SchemaValidatorsFactory] = None,
         path_finder_cls: Optional[PathFinderType] = None,
@@ -74,8 +70,12 @@ def __init__(
         self,
         spec: SchemaPath,
         base_url: Optional[str] = None,
-        style_deserializers_factory: StyleDeserializersFactory = style_deserializers_factory,
-        media_type_deserializers_factory: MediaTypeDeserializersFactory = media_type_deserializers_factory,
+        style_deserializers_factory: Optional[
+            StyleDeserializersFactory
+        ] = None,
+        media_type_deserializers_factory: Optional[
+            MediaTypeDeserializersFactory
+        ] = None,
         schema_casters_factory: Optional[SchemaCastersFactory] = None,
         schema_validators_factory: Optional[SchemaValidatorsFactory] = None,
         path_finder_cls: Optional[PathFinderType] = None,

openapi_core/unmarshalling/request/unmarshallers.py

@@ -4,16 +4,12 @@
 from openapi_spec_validator.validation.types import SpecValidatorType
 
 from openapi_core.casting.schemas.factories import SchemaCastersFactory
-from openapi_core.deserializing.media_types import (
-    media_type_deserializers_factory,
-)
 from openapi_core.deserializing.media_types.datatypes import (
     MediaTypeDeserializersDict,
 )
 from openapi_core.deserializing.media_types.factories import (
     MediaTypeDeserializersFactory,
 )
-from openapi_core.deserializing.styles import style_deserializers_factory
 from openapi_core.deserializing.styles.factories import (
     StyleDeserializersFactory,
 )
@@ -85,8 +81,12 @@ def __init__(
         self,
         spec: SchemaPath,
         base_url: Optional[str] = None,
-        style_deserializers_factory: StyleDeserializersFactory = style_deserializers_factory,
-        media_type_deserializers_factory: MediaTypeDeserializersFactory = media_type_deserializers_factory,
+        style_deserializers_factory: Optional[
+            StyleDeserializersFactory
+        ] = None,
+        media_type_deserializers_factory: Optional[
+            MediaTypeDeserializersFactory
+        ] = None,
         schema_casters_factory: Optional[SchemaCastersFactory] = None,
         schema_validators_factory: Optional[SchemaValidatorsFactory] = None,
         path_finder_cls: Optional[PathFinderType] = None,

openapi_core/unmarshalling/response/protocols.py

@@ -8,16 +8,12 @@
 from openapi_spec_validator.validation.types import SpecValidatorType
 
 from openapi_core.casting.schemas.factories import SchemaCastersFactory
-from openapi_core.deserializing.media_types import (
-    media_type_deserializers_factory,
-)
 from openapi_core.deserializing.media_types.datatypes import (
     MediaTypeDeserializersDict,
 )
 from openapi_core.deserializing.media_types.factories import (
     MediaTypeDeserializersFactory,
 )
-from openapi_core.deserializing.styles import style_deserializers_factory
 from openapi_core.deserializing.styles.factories import (
     StyleDeserializersFactory,
 )
@@ -44,8 +40,12 @@ def __init__(
         self,
         spec: SchemaPath,
         base_url: Optional[str] = None,
-        style_deserializers_factory: StyleDeserializersFactory = style_deserializers_factory,
-        media_type_deserializers_factory: MediaTypeDeserializersFactory = media_type_deserializers_factory,
+        style_deserializers_factory: Optional[
+            StyleDeserializersFactory
+        ] = None,
+        media_type_deserializers_factory: Optional[
+            MediaTypeDeserializersFactory
+        ] = None,
         schema_casters_factory: Optional[SchemaCastersFactory] = None,
         schema_validators_factory: Optional[SchemaValidatorsFactory] = None,
         path_finder_cls: Optional[PathFinderType] = None,
@@ -75,8 +75,8 @@ def __init__(
         self,
         spec: SchemaPath,
         base_url: Optional[str] = None,
-        style_deserializers_factory: StyleDeserializersFactory = style_deserializers_factory,
-        media_type_deserializers_factory: MediaTypeDeserializersFactory = media_type_deserializers_factory,
+        style_deserializers_factory: StyleDeserializersFactory = None,
+        media_type_deserializers_factory: MediaTypeDeserializersFactory = None,
         schema_casters_factory: Optional[SchemaCastersFactory] = None,
         schema_validators_factory: Optional[SchemaValidatorsFactory] = None,
         path_finder_cls: Optional[PathFinderType] = None,