Unmarshallers format validators refactor

Author: p1c2u

openapi_core/unmarshalling/schemas/__init__.py

@@ -1,31 +1,116 @@
-from openapi_schema_validator import OAS30Validator
-from openapi_schema_validator import OAS31Validator
+from collections import OrderedDict
+from functools import partial
+
+from isodate.isodatetime import parse_datetime
 
 from openapi_core.unmarshalling.schemas.enums import ValidationContext
 from openapi_core.unmarshalling.schemas.factories import (
     SchemaUnmarshallersFactory,
 )
+from openapi_core.unmarshalling.schemas.unmarshallers import AnyUnmarshaller
+from openapi_core.unmarshalling.schemas.unmarshallers import ArrayUnmarshaller
+from openapi_core.unmarshalling.schemas.unmarshallers import (
+    MultiTypeUnmarshaller,
+)
+from openapi_core.unmarshalling.schemas.unmarshallers import (
+    ObjectReadUnmarshaller,
+)
+from openapi_core.unmarshalling.schemas.unmarshallers import ObjectUnmarshaller
+from openapi_core.unmarshalling.schemas.unmarshallers import (
+    ObjectWriteUnmarshaller,
+)
+from openapi_core.unmarshalling.schemas.unmarshallers import (
+    PrimitiveUnmarshaller,
+)
+from openapi_core.unmarshalling.schemas.unmarshallers import TypesUnmarshaller
+from openapi_core.unmarshalling.schemas.util import format_byte
+from openapi_core.unmarshalling.schemas.util import format_date
+from openapi_core.unmarshalling.schemas.util import format_uuid
+from openapi_core.validation.schemas import (
+    oas30_read_schema_validators_factory,
+)
+from openapi_core.validation.schemas import (
+    oas30_write_schema_validators_factory,
+)
+from openapi_core.validation.schemas import oas31_schema_validators_factory
 
 __all__ = [
-    "oas30_request_schema_unmarshallers_factory",
-    "oas30_response_schema_unmarshallers_factory",
-    "oas31_request_schema_unmarshallers_factory",
-    "oas31_response_schema_unmarshallers_factory",
+    "oas30_format_unmarshallers",
+    "oas31_format_unmarshallers",
+    "oas30_write_schema_unmarshallers_factory",
+    "oas30_read_schema_unmarshallers_factory",
     "oas31_schema_unmarshallers_factory",
 ]
 
-oas30_request_schema_unmarshallers_factory = SchemaUnmarshallersFactory(
-    OAS30Validator,
-    context=ValidationContext.REQUEST,
+oas30_unmarshallers_dict = OrderedDict(
+    [
+        ("string", PrimitiveUnmarshaller),
+        ("integer", PrimitiveUnmarshaller),
+        ("number", PrimitiveUnmarshaller),
+        ("boolean", PrimitiveUnmarshaller),
+        ("array", ArrayUnmarshaller),
+        ("object", ObjectUnmarshaller),
+    ]
+)
+oas30_write_unmarshallers_dict = oas30_unmarshallers_dict.copy()
+oas30_write_unmarshallers_dict.update(
+    {
+        "object": ObjectWriteUnmarshaller,
+    }
+)
+oas30_read_unmarshallers_dict = oas30_unmarshallers_dict.copy()
+oas30_read_unmarshallers_dict.update(
+    {
+        "object": ObjectReadUnmarshaller,
+    }
+)
+oas31_unmarshallers_dict = oas30_unmarshallers_dict.copy()
+oas31_unmarshallers_dict.update(
+    {
+        "null": PrimitiveUnmarshaller,
+    }
+)
+
+oas30_write_types_unmarshaller = TypesUnmarshaller(
+    oas30_unmarshallers_dict,
+    AnyUnmarshaller,
+)
+oas30_read_types_unmarshaller = TypesUnmarshaller(
+    oas30_unmarshallers_dict,
+    AnyUnmarshaller,
+)
+oas31_types_unmarshaller = TypesUnmarshaller(
+    oas31_unmarshallers_dict,
+    AnyUnmarshaller,
+    multi=MultiTypeUnmarshaller,
+)
+
+oas30_format_unmarshallers = {
+    # string compatible
+    "date": format_date,
+    "date-time": parse_datetime,
+    "binary": bytes,
+    "uuid": format_uuid,
+    "byte": format_byte,
+}
+oas31_format_unmarshallers = oas30_format_unmarshallers
+
+oas30_write_schema_unmarshallers_factory = SchemaUnmarshallersFactory(
+    oas30_write_schema_validators_factory,
+    oas30_write_types_unmarshaller,
+    format_unmarshallers=oas30_format_unmarshallers,
 )
 
-oas30_response_schema_unmarshallers_factory = SchemaUnmarshallersFactory(
-    OAS30Validator,
-    context=ValidationContext.RESPONSE,
+oas30_read_schema_unmarshallers_factory = SchemaUnmarshallersFactory(
+    oas30_read_schema_validators_factory,
+    oas30_read_types_unmarshaller,
+    format_unmarshallers=oas30_format_unmarshallers,
 )
 
 oas31_schema_unmarshallers_factory = SchemaUnmarshallersFactory(
-    OAS31Validator,
+    oas31_schema_validators_factory,
+    oas31_types_unmarshaller,
+    format_unmarshallers=oas31_format_unmarshallers,
 )
 
 # alias to v31 version (request/response are the same bcs no context needed)

openapi_core/unmarshalling/schemas/datatypes.py

@@ -1,7 +1,12 @@
+from typing import Any
+from typing import Callable
 from typing import Dict
 from typing import Optional
 
 from openapi_core.unmarshalling.schemas.formatters import Formatter
 
+FormatUnmarshaller = Callable[[Any], Any]
+
 CustomFormattersDict = Dict[str, Formatter]
 FormattersDict = Dict[Optional[str], Formatter]
+UnmarshallersDict = Dict[str, Callable[[Any], Any]]

openapi_core/unmarshalling/schemas/exceptions.py

@@ -1,6 +1,4 @@
 from dataclasses import dataclass
-from dataclasses import field
-from typing import Iterable
 
 from openapi_core.exceptions import OpenAPIError
 
@@ -9,49 +7,32 @@ class UnmarshalError(OpenAPIError):
     """Schema unmarshal operation error"""
 
 
-class ValidateError(UnmarshalError):
-    """Schema validate operation error"""
-
-
 class UnmarshallerError(UnmarshalError):
     """Unmarshaller error"""
 
 
 @dataclass
-class InvalidSchemaValue(ValidateError):
-    value: str
-    type: str
-    schema_errors: Iterable[Exception] = field(default_factory=list)
+class FormatterNotFoundError(UnmarshallerError):
+    """Formatter not found to unmarshal"""
+
+    type_format: str
 
     def __str__(self) -> str:
-        return (
-            "Value {value} not valid for schema of type {type}: {errors}"
-        ).format(value=self.value, type=self.type, errors=self.schema_errors)
+        return f"Formatter not found for {self.type_format} format"
 
 
-@dataclass
-class InvalidSchemaFormatValue(UnmarshallerError):
-    """Value failed to format with formatter"""
+class FormatUnmarshalError(UnmarshallerError):
+    """Unable to unmarshal value for format"""
 
     value: str
     type: str
     original_exception: Exception
 
     def __str__(self) -> str:
         return (
-            "Failed to format value {value} to format {type}: {exception}"
+            "Unable to unmarshal value {value} for format {type}: {exception}"
         ).format(
             value=self.value,
             type=self.type,
             exception=self.original_exception,
         )
-
-
-@dataclass
-class FormatterNotFoundError(UnmarshallerError):
-    """Formatter not found to unmarshal"""
-
-    type_format: str
-
-    def __str__(self) -> str:
-        return f"Formatter not found for {self.type_format} format"