Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Add additional meta data to schema and errors#120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
danielbradburn wants to merge8 commits intopython-openapi:master
base:master
Choose a base branch
Loading
fromcrunchr:schema-additional-metadata
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletionopenapi_core/schema/schemas/exceptions.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,9 @@
import attr


@attr.s
class OpenAPISchemaError(OpenAPIMappingError):
pass
schema = attr.ib()


@attr.s
Expand DownExpand Up@@ -77,3 +78,19 @@ class MultipleOneOfSchema(OpenAPISchemaError):

def __str__(self):
return "Exactly one schema type {0} should be valid, more than one found".format(self.type)


@attr.s
class InvalidSchema(OpenAPISchemaError):
msg = attr.ib()

def __str__(self):
return self.msg


@attr.s
class InvalidFormat(OpenAPISchemaError):
msg = attr.ib()

def __str__(self):
return self.msg
3 changes: 2 additions & 1 deletionopenapi_core/schema/schemas/factories.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ class SchemaFactory(object):
def __init__(self, dereferencer):
self.dereferencer = dereferencer

def create(self, schema_spec):
def create(self, schema_spec, schema_name=''):
schema_deref = self.dereferencer.dereference(schema_spec)

schema_type = schema_deref.get('type', None)
Expand DownExpand Up@@ -75,6 +75,7 @@ def create(self, schema_spec):
exclusive_maximum=exclusive_maximum,
exclusive_minimum=exclusive_minimum,
min_properties=min_properties, max_properties=max_properties,
schema_name=schema_name, schema_deref=schema_deref,
)

@property
Expand Down
2 changes: 1 addition & 1 deletionopenapi_core/schema/schemas/generators.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,5 +16,5 @@ def generate(self, schemas_spec):
schemas_deref = self.dereferencer.dereference(schemas_spec)

for schema_name, schema_spec in iteritems(schemas_deref):
schema, _ = self.schemas_registry.get_or_create(schema_spec)
schema, _ = self.schemas_registry.get_or_create(schema_spec, schema_name)
yield schema_name, schema
101 changes: 62 additions & 39 deletionsopenapi_core/schema/schemas/models.py
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletionsopenapi_core/schema/schemas/registries.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,17 @@ def __init__(self, dereferencer):
super(SchemaRegistry, self).__init__(dereferencer)
self._schemas = {}

def get_or_create(self, schema_spec):
def get_or_create(self, schema_spec, schema_name=''):
schema_hash = dicthash(schema_spec)
schema_deref = self.dereferencer.dereference(schema_spec)

if schema_hash in self._schemas:
return self._schemas[schema_hash], False

if '$ref' in schema_spec:
schema = Proxy(lambda: self.create(schema_deref))
schema = Proxy(lambda: self.create(schema_deref, schema_name))
else:
schema = self.create(schema_deref)
schema = self.create(schema_deref, schema_name)

self._schemas[schema_hash] = schema

Expand Down
3 changes: 2 additions & 1 deletionrequirements_dev.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,5 @@ mock==2.0.0
pytest==3.5.0
pytest-flake8
pytest-cov==2.5.1
flask
flask
ruamel.yaml==0.15.89
27 changes: 27 additions & 0 deletionstests/unit/schema/test_exceptions.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
from openapi_core.schema.schemas import exceptions
import pytest
import attr


def is_open_api_exception(exception_type):
try:
return issubclass(exception_type, exceptions.OpenAPISchemaError)
except TypeError:
return False


class TestExceptions:

@pytest.mark.parametrize(
"exception_type",
(
exception_type
for exception_type_name in dir(exceptions)
for exception_type in [getattr(exceptions, exception_type_name)]
if is_open_api_exception(exception_type)
)
)
def test_convert_to_string(self, exception_type):
# verify that we can convert to a string without error
args = ['x'] * len(attr.fields(exception_type))
str(exception_type(*args))
89 changes: 79 additions & 10 deletionstests/unit/schema/test_schemas.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@

from openapi_core.extensions.models.models import Model
from openapi_core.schema.schemas.exceptions import (
InvalidSchemaValue, MultipleOneOfSchema, NoOneOfSchema, OpenAPISchemaError,
InvalidSchemaValue, MultipleOneOfSchema, NoOneOfSchema,
OpenAPISchemaError, InvalidSchema, InvalidFormat, NoValidSchema,
InvalidSchemaProperty
)
from openapi_core.schema.schemas.models import Schema

Expand DownExpand Up@@ -102,27 +104,31 @@ def test_string_format_custom(self):

assert result == 'x-custom'

def test_string_format_unknown(self):
@pytest.mark.parametrize("custom_formatters", (None, {}))
def test_string_format_unknown(self, custom_formatters):
unknown_format = 'unknown'
schema = Schema('string', schema_format=unknown_format)
value = 'x'

with pytest.raises(OpenAPISchemaError):
schema.unmarshal(value)
schema.unmarshal(value, custom_formatters)

@pytest.mark.xfail(reason="No custom formats support atm")
def test_string_format_invalid_value(self):
custom_format = 'custom'
schema = Schema('string', schema_format=custom_format)
value = 'x'

with mock.patch.dict(
Schema.STRING_FORMAT_CAST_CALLABLE_GETTER,
{custom_format: mock.Mock(side_effect=ValueError())},
), pytest.raises(
InvalidSchemaValue, message='Failed to format value'
def _raise(e): raise e()

custom_formatters = {
custom_format: mock.Mock(unmarshal=lambda x: _raise(ValueError))
}

with pytest.raises(
InvalidSchemaValue,
message='Failed to format value'
):
schema.unmarshal(value)
schema.unmarshal(value, custom_formatters)

def test_integer_valid(self):
schema = Schema('integer')
Expand DownExpand Up@@ -171,6 +177,38 @@ def test_integer_invalid(self):
with pytest.raises(InvalidSchemaValue):
schema.unmarshal(value)

def test_any_no_valid_schema(self):
schema = Schema()

class Uncastable:
def _raise(self):
raise ValueError()
__nonzero__ = __bool__ = __trunc__ = __float__ = __str__ = _raise

value = Uncastable()

with pytest.raises(NoValidSchema):
schema.unmarshal(value)

def test_multiple_one_of(self):
schema = Schema('object', one_of=[
Schema('object', properties={
'one': Schema('string')
}),
Schema('object', properties={
'one': Schema('string')
}),
])
with pytest.raises(MultipleOneOfSchema):
schema.unmarshal({'one': 'one'})

def test_invalid_schema_property(self):
schema = Schema('object', properties={
'one': Schema('integer')
})
with pytest.raises(InvalidSchemaProperty):
schema.unmarshal({'one': 'one'})


class TestSchemaValidate(object):

Expand DownExpand Up@@ -763,3 +801,34 @@ def test_list_unique_items_invalid(self, value):

with pytest.raises(Exception):
schema.validate(value)

@pytest.mark.parametrize('schema,value', [
(Schema('array', items=Schema('number'), min_items=-1), []),
(Schema('array', items=Schema('number'), max_items=-1), []),
(Schema('string', min_length=-1), u('')),
(Schema('string', max_length=-1), u('')),
(Schema('object', min_properties=-1), Model()),
(Schema('object', max_properties=-1), Model()),
])
def test_validate_invalid_schema(self, schema, value):
with pytest.raises(InvalidSchema):
schema.validate(value)

@pytest.mark.parametrize('custom_formatters', [
{},
None,
])
def test_validate_string_format_unknown(self, custom_formatters):
unknown_format = 'unknown'
schema = Schema('string', schema_format=unknown_format)
value = 'x'

with pytest.raises(InvalidFormat):
schema.validate(value, custom_formatters)

def test_invalid_schema_property(self):
schema = Schema('object', properties={
'one': Schema('integer')
})
with pytest.raises(InvalidSchemaProperty):
schema.validate(Model({'one': 'one'}))
[8]ページ先頭
©2009-2025 Movatter.jp