Schema validate exceptions refactor

Author: p1c2u

openapi_core/schema/schemas/exceptions.py

@@ -7,8 +7,24 @@ class OpenAPISchemaError(OpenAPIMappingError):
     pass
 
 
+@attr.s(hash=True)
+class CastError(OpenAPISchemaError):
+    """Schema cast operation error"""
+    value = attr.ib()
+    type = attr.ib()
+
+    def __str__(self):
+        return "Failed to cast value {value} to type {type}".format(
+            value=self.value, type=self.type)
+
+
+class ValidateError(OpenAPISchemaError):
+    """Schema validate operation error"""
+    pass
+
+
 class UnmarshallError(OpenAPISchemaError):
-    """Unmarshall operation error"""
+    """Schema unmarshall operation error"""
     pass
 
 
@@ -29,56 +45,13 @@ def __str__(self):
 
 
 @attr.s(hash=True)
-class NoValidSchema(OpenAPISchemaError):
-    value = attr.ib()
-
-    def __str__(self):
-        return "No valid schema found for value: {0}".format(self.value)
-
-
-@attr.s(hash=True)
-class UndefinedItemsSchema(OpenAPISchemaError):
-    type = attr.ib()
-
-    def __str__(self):
-        return "Null value for schema type {0}".format(self.type)
-
-
-@attr.s(hash=True)
-class InvalidSchemaValue(OpenAPISchemaError):
-    msg = attr.ib()
+class InvalidSchemaValue(ValidateError):
     value = attr.ib()
     type = attr.ib()
 
     def __str__(self):
-        return self.msg.format(value=self.value, type=self.type)
-
-
-@attr.s(hash=True)
-class UndefinedSchemaProperty(OpenAPISchemaError):
-    extra_props = attr.ib()
-
-    def __str__(self):
-        return "Extra unexpected properties found in schema: {0}".format(
-            self.extra_props)
-
-
-@attr.s(hash=True)
-class InvalidSchemaProperty(OpenAPISchemaError):
-    property_name = attr.ib()
-    original_exception = attr.ib()
-
-    def __str__(self):
-        return "Invalid schema property {0}: {1}".format(
-            self.property_name, self.original_exception)
-
-
-@attr.s(hash=True)
-class MissingSchemaProperty(OpenAPISchemaError):
-    property_name = attr.ib()
-
-    def __str__(self):
-        return "Missing schema property: {0}".format(self.property_name)
+        return "Value {value} not valid for schema of type {type}".format(
+            value=self.value, type=self.type)
 
 
 class UnmarshallerError(UnmarshallError):

openapi_core/schema/schemas/models.py

@@ -15,9 +15,7 @@
 from openapi_core.schema.schemas._format import oas30_format_checker
 from openapi_core.schema.schemas.enums import SchemaFormat, SchemaType
 from openapi_core.schema.schemas.exceptions import (
-    InvalidSchemaValue, UndefinedSchemaProperty, MissingSchemaProperty,
-    OpenAPISchemaError, NoValidSchema,
-    UndefinedItemsSchema, InvalidSchemaProperty,
+    CastError, InvalidSchemaValue,
     UnmarshallerError, UnmarshallValueError, UnmarshallError,
 )
 from openapi_core.schema.schemas.util import (
@@ -141,13 +139,6 @@ def get_all_required_properties_names(self):
 
         return set(required)
 
-    def are_additional_properties_allowed(self, one_of_schema=None):
-        return (
-            (self.additional_properties is not False) and
-            (one_of_schema is None or
-                one_of_schema.additional_properties is not False)
-        )
-
     def get_cast_mapping(self):
         mapping = self.TYPE_CAST_CALLABLE_GETTER.copy()
         mapping.update({
@@ -167,8 +158,7 @@ def cast(self, value):
         try:
             return cast_callable(value)
         except ValueError:
-            raise InvalidSchemaValue(
-                "Failed to cast value {value} to type {type}", value, self.type)
+            raise CastError(value, self.type)
 
     def _cast_collection(self, value):
         return list(map(self.items.cast, value))
@@ -204,7 +194,7 @@ def validate(self, value, resolver=None):
             return validator.validate(value)
         except ValidationError:
             # TODO: pass validation errors
-            raise InvalidSchemaValue("Value not valid for schema", value, self.type)
+            raise InvalidSchemaValue(value, self.type)
 
     def unmarshal(self, value, custom_formatters=None, strict=True):
         """Unmarshal parameter from the value."""
@@ -310,7 +300,7 @@ def _unmarshal_object(self, value, model_factory=None,
                 try:
                     unmarshalled = self._unmarshal_properties(
                         value, one_of_schema, custom_formatters=custom_formatters)
-                except OpenAPISchemaError:
+                except (UnmarshallError, ValueError):
                     pass
                 else:
                     if properties is not None:
@@ -342,10 +332,6 @@ def _unmarshal_properties(self, value, one_of_schema=None,
 
         value_props_names = value.keys()
         extra_props = set(value_props_names) - set(all_props_names)
-        extra_props_allowed = self.are_additional_properties_allowed(
-            one_of_schema)
-        if extra_props and not extra_props_allowed:
-            raise UndefinedSchemaProperty(extra_props)
 
         properties = {}
         if self.additional_properties is not True:
@@ -358,8 +344,6 @@ def _unmarshal_properties(self, value, one_of_schema=None,
             try:
                 prop_value = value[prop_name]
             except KeyError:
-                if prop_name in all_req_props_names:
-                    raise MissingSchemaProperty(prop_name)
                 if not prop.nullable and not prop.default:
                     continue
                 prop_value = prop.default

openapi_core/schema/schemas/unmarshallers.py

@@ -2,9 +2,7 @@
 
 from openapi_core.schema.schemas.enums import SchemaFormat, SchemaType
 from openapi_core.schema.schemas.exceptions import (
-    InvalidSchemaValue, InvalidCustomFormatSchemaValue,
-    OpenAPISchemaError,
-    InvalidSchemaProperty,
+    InvalidCustomFormatSchemaValue,
     UnmarshallerStrictTypeError,
     FormatterNotFoundError,
 )

tests/integration/validation/test_petstore.py

@@ -178,7 +178,6 @@ def test_get_pets_invalid_response(self, spec, response_validator):
         assert response_result.errors == [
             InvalidMediaTypeValue(
                 original_exception=InvalidSchemaValue(
-                    msg='Value not valid for schema',
                     type=SchemaType.OBJECT,
                     value=data_json,
                 ),