Merge pull request #189 from p1c2u/refactor/get-rid-of-unmarshal-in-schema

Get rid of unmarshal in schema

Author: p1c2u

openapi_core/schema/schemas/models.py

@@ -5,9 +5,6 @@
 
 from openapi_core.schema.schemas.enums import SchemaType
 from openapi_core.schema.schemas.types import NoValue
-from openapi_core.unmarshalling.schemas.exceptions import (
-    UnmarshalValueError,
-)
 
 log = logging.getLogger(__name__)
 
@@ -104,16 +101,3 @@ def cast(self, value):
             return caster(value)
         except (ValueError, TypeError):
             raise CastError(value, self.type)
-
-    def unmarshal(self, value, resolver=None, custom_formatters=None):
-        """Unmarshal parameter from the value."""
-        from openapi_core.unmarshalling.schemas.factories import (
-            SchemaUnmarshallersFactory,
-        )
-        unmarshallers_factory = SchemaUnmarshallersFactory(
-            resolver, custom_formatters)
-        unmarshaller = unmarshallers_factory.create(self)
-        try:
-            return unmarshaller(value)
-        except ValueError as exc:
-            raise UnmarshalValueError(value, self.type, exc)

openapi_core/unmarshalling/schemas/exceptions.py

@@ -18,22 +18,6 @@ class UnmarshallerError(UnmarshalError):
     pass
 
 
-@attr.s(hash=True)
-class UnmarshalValueError(UnmarshalError):
-    """Failed to unmarshal value to type"""
-    value = attr.ib()
-    type = attr.ib()
-    original_exception = attr.ib(default=None)
-
-    def __str__(self):
-        return (
-            "Failed to unmarshal value {value} to type {type}: {exception}"
-        ).format(
-            value=self.value, type=self.type,
-            exception=self.original_exception,
-        )
-
-
 @attr.s(hash=True)
 class InvalidSchemaValue(ValidateError):
     value = attr.ib()

openapi_core/validation/request/validators.py

@@ -157,8 +157,11 @@ def _unmarshal(self, param_or_media_type, value):
         if not param_or_media_type.schema:
             return value
 
-        return param_or_media_type.schema.unmarshal(
-            value,
-            resolver=self.spec._resolver,
-            custom_formatters=self.custom_formatters,
+        from openapi_core.unmarshalling.schemas.factories import (
+            SchemaUnmarshallersFactory,
         )
+        unmarshallers_factory = SchemaUnmarshallersFactory(
+            self.spec._resolver, self.custom_formatters)
+        unmarshaller = unmarshallers_factory.create(
+            param_or_media_type.schema)
+        return unmarshaller(value)

openapi_core/validation/response/validators.py

@@ -104,8 +104,11 @@ def _unmarshal(self, param_or_media_type, value):
         if not param_or_media_type.schema:
             return value
 
-        return param_or_media_type.schema.unmarshal(
-            value,
-            resolver=self.spec._resolver,
-            custom_formatters=self.custom_formatters,
+        from openapi_core.unmarshalling.schemas.factories import (
+            SchemaUnmarshallersFactory,
         )
+        unmarshallers_factory = SchemaUnmarshallersFactory(
+            self.spec._resolver, self.custom_formatters)
+        unmarshaller = unmarshallers_factory.create(
+            param_or_media_type.schema)
+        return unmarshaller(value)