Skip to content
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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Change numeric constraints to correct mapping #94

Merged
merged 1 commit into from
Feb 26, 2020
Merged

Change numeric constraints to correct mapping #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 39 additions & 36 deletions datamodel_code_generator/model/pydantic/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Any, Dict
from typing import Any, Dict, Set

from datamodel_code_generator.imports import (
IMPORT_CONFLOAT,
Expand Down Expand Up @@ -66,24 +66,44 @@
),
}

kwargs_schema_to_model = {
'exclusiveMinimum': 'gt',
'minimum': 'ge',
'exclusiveMaximum': 'lt',
'maximum': 'le',
'multipleOf': 'multiple_of',
'minItems': 'min_items',
'maxItems': 'max_items',
'minLength': 'min_length',
'maxLength': 'max_length',
'pattern': 'regex',
}

number_kwargs = {
'exclusiveMinimum',
'minimum',
'exclusiveMaximum',
'maximum',
'multipleOf',
}

string_kwargs = {'minItems', 'maxItems', 'minLength', 'maxLength', 'pattern'}

def get_data_int_type(types: Types, **kwargs: Any) -> DataType:
data_type_kwargs: Dict[str, str] = {}
if kwargs.get('maximum') is not None:
data_type_kwargs['gt'] = kwargs['maximum']
if kwargs.get('exclusiveMaximum') is not None:
data_type_kwargs['ge'] = kwargs['exclusiveMaximum']
if kwargs.get('minimum') is not None:
data_type_kwargs['lt'] = kwargs['minimum']
if kwargs.get('exclusiveMinimum') is not None:
data_type_kwargs['le'] = kwargs['exclusiveMinimum']
if kwargs.get('multipleOf') is not None:
data_type_kwargs['multiple_of'] = kwargs['multipleOf']

def transform_kwargs(kwargs: Dict[str, Any], filter: Set[str]) -> Dict[str, str]:
return {
kwargs_schema_to_model.get(k, k): v
for (k, v) in kwargs.items()
if v is not None and k in filter
}


def get_data_int_type(types: Types, **kwargs: Any) -> DataType:
data_type_kwargs = transform_kwargs(kwargs, number_kwargs)
if data_type_kwargs:
if len(data_type_kwargs) == 1 and data_type_kwargs.get('le') == 0:
if data_type_kwargs == {'gt': 0}:
return DataType(type='PositiveInt')
if len(data_type_kwargs) == 1 and data_type_kwargs.get('ge') == 0:
if data_type_kwargs == {'lt': 0}:
return DataType(type='NegativeInt')
return DataType(
type='conint',
Expand All @@ -95,22 +115,11 @@ def get_data_int_type(types: Types, **kwargs: Any) -> DataType:


def get_data_float_type(types: Types, **kwargs: Any) -> DataType:
data_type_kwargs: Dict[str, str] = {}
if kwargs.get('maximum') is not None:
data_type_kwargs['gt'] = kwargs['maximum']
if kwargs.get('exclusiveMaximum') is not None:
data_type_kwargs['ge'] = kwargs['exclusiveMaximum']
if kwargs.get('minimum') is not None:
data_type_kwargs['lt'] = kwargs['minimum']
if kwargs.get('exclusiveMinimum') is not None:
data_type_kwargs['le'] = kwargs['exclusiveMinimum']
if kwargs.get('multipleOf') is not None:
data_type_kwargs['multiple_of'] = kwargs['multipleOf']

data_type_kwargs = transform_kwargs(kwargs, number_kwargs)
if data_type_kwargs:
if len(data_type_kwargs) == 1 and data_type_kwargs.get('le') == 0:
if data_type_kwargs == {'gt': 0}:
return DataType(type='PositiveFloat')
if len(data_type_kwargs) == 1 and data_type_kwargs.get('ge') == 0:
if data_type_kwargs == {'lt': 0}:
return DataType(type='NegativeFloat')
return DataType(
type='confloat',
Expand All @@ -122,13 +131,7 @@ def get_data_float_type(types: Types, **kwargs: Any) -> DataType:


def get_data_str_type(types: Types, **kwargs: Any) -> DataType:
data_type_kwargs: Dict[str, str] = {}
if kwargs.get('pattern') is not None:
data_type_kwargs['regex'] = kwargs['pattern']
if kwargs.get('minLength') is not None:
data_type_kwargs['min_length'] = kwargs['minLength']
if kwargs.get('maxLength') is not None:
data_type_kwargs['max_length'] = kwargs['maxLength']
data_type_kwargs = transform_kwargs(kwargs, string_kwargs)
if data_type_kwargs:
return DataType(
type='constr',
Expand Down
16 changes: 8 additions & 8 deletions tests/model/pydantic/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,28 @@
Types.integer,
{'maximum': 10},
DataType(
type='conint', is_func=True, kwargs={'gt': 10}, imports_=[IMPORT_CONINT]
type='conint', is_func=True, kwargs={'le': 10}, imports_=[IMPORT_CONINT]
),
),
(
Types.integer,
{'exclusiveMaximum': 10},
DataType(
type='conint', is_func=True, kwargs={'ge': 10}, imports_=[IMPORT_CONINT]
type='conint', is_func=True, kwargs={'lt': 10}, imports_=[IMPORT_CONINT]
),
),
(
Types.integer,
{'minimum': 10},
DataType(
type='conint', is_func=True, kwargs={'lt': 10}, imports_=[IMPORT_CONINT]
type='conint', is_func=True, kwargs={'ge': 10}, imports_=[IMPORT_CONINT]
),
),
(
Types.integer,
{'exclusiveMinimum': 10},
DataType(
type='conint', is_func=True, kwargs={'le': 10}, imports_=[IMPORT_CONINT]
type='conint', is_func=True, kwargs={'gt': 10}, imports_=[IMPORT_CONINT]
),
),
(
Expand Down Expand Up @@ -73,7 +73,7 @@ def test_get_data_int_type(types, params, data_type):
DataType(
type='confloat',
is_func=True,
kwargs={'gt': 10},
kwargs={'le': 10},
imports_=[IMPORT_CONFLOAT],
),
),
Expand All @@ -83,7 +83,7 @@ def test_get_data_int_type(types, params, data_type):
DataType(
type='confloat',
is_func=True,
kwargs={'ge': 10},
kwargs={'lt': 10},
imports_=[IMPORT_CONFLOAT],
),
),
Expand All @@ -93,7 +93,7 @@ def test_get_data_int_type(types, params, data_type):
DataType(
type='confloat',
is_func=True,
kwargs={'lt': 10},
kwargs={'ge': 10},
imports_=[IMPORT_CONFLOAT],
),
),
Expand All @@ -103,7 +103,7 @@ def test_get_data_int_type(types, params, data_type):
DataType(
type='confloat',
is_func=True,
kwargs={'le': 10},
kwargs={'gt': 10},
imports_=[IMPORT_CONFLOAT],
),
),
Expand Down
2 changes: 1 addition & 1 deletion tests/parser/test_jsonschema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_json_schema_object_ref_url():
"""class Pets(BaseModel):
firstName: Optional[str] = None
lastName: Optional[str] = None
age: Optional[conint(lt=0.0)] = None""",
age: Optional[conint(ge=0.0)] = None""",
)
],
)
Expand Down
2 changes: 1 addition & 1 deletion tests/parser/test_openapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ class AllOfobj(BaseModel):

class AllOfCombine(Pet):
birthdate: Optional[date] = None
size: Optional[conint(lt=1.0)] = None
size: Optional[conint(ge=1.0)] = None


class AnyOfCombine(Pet, Car):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def test_main_autodetect():
class Person(BaseModel):
firstName: Optional[str] = None
lastName: Optional[str] = None
age: Optional[conint(lt=0.0)] = None
age: Optional[conint(ge=0.0)] = None
'''
)

Expand Down Expand Up @@ -364,7 +364,7 @@ def test_main_jsonschema():
class Person(BaseModel):
firstName: Optional[str] = None
lastName: Optional[str] = None
age: Optional[conint(lt=0.0)] = None
age: Optional[conint(ge=0.0)] = None
'''
)

Expand Down