fix conint confloat args (#128)

koxudaxi · May 19, 2020 · 9bc3229 · 9bc3229
1 parent 258f214
commit 9bc3229
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/datamodel_code_generator/model/pydantic/types.py b/datamodel_code_generator/model/pydantic/types.py
@@ -109,7 +109,7 @@ def get_data_int_type(types: Types, **kwargs: Any) -> DataType:
         return DataType(
             type='conint',
             is_func=True,
-            kwargs=data_type_kwargs,
+            kwargs={k: int(v) for k, v in data_type_kwargs.items()},
             imports_=[IMPORT_CONINT],
         )
     return type_map[types]
@@ -125,7 +125,7 @@ def get_data_float_type(types: Types, **kwargs: Any) -> DataType:
         return DataType(
             type='confloat',
             is_func=True,
-            kwargs=data_type_kwargs,
+            kwargs={k: float(v) for k, v in data_type_kwargs.items()},
             imports_=[IMPORT_CONFLOAT],
         )
     return type_map[types]

diff --git a/docs/jsonschema.md b/docs/jsonschema.md
@@ -5,7 +5,7 @@ The codegen generate pydantic models from JsonSchema
 ## Example
 
 ```bash
-$ datamodel-codegen  --input person.json --input-file-type jsonshema --output model.py
+$ datamodel-codegen  --input person.json --input-file-type jsonschema --output model.py
 ```
 
 `person.json`:

diff --git a/tests/model/pydantic/test_types.py b/tests/model/pydantic/test_types.py
@@ -84,7 +84,7 @@ def test_get_data_int_type(types, params, data_type):
             DataType(
                 type='confloat',
                 is_func=True,
-                kwargs={'lt': 10},
+                kwargs={'lt': 10.0},
                 imports_=[IMPORT_CONFLOAT],
             ),
         ),
@@ -94,7 +94,7 @@ def test_get_data_int_type(types, params, data_type):
             DataType(
                 type='confloat',
                 is_func=True,
-                kwargs={'ge': 10},
+                kwargs={'ge': 10.0},
                 imports_=[IMPORT_CONFLOAT],
             ),
         ),
@@ -104,7 +104,7 @@ def test_get_data_int_type(types, params, data_type):
             DataType(
                 type='confloat',
                 is_func=True,
-                kwargs={'gt': 10},
+                kwargs={'gt': 10.0},
                 imports_=[IMPORT_CONFLOAT],
             ),
         ),
@@ -114,7 +114,7 @@ def test_get_data_int_type(types, params, data_type):
             DataType(
                 type='confloat',
                 is_func=True,
-                kwargs={'multiple_of': 10},
+                kwargs={'multiple_of': 10.0},
                 imports_=[IMPORT_CONFLOAT],
             ),
         ),

diff --git a/tests/parser/test_jsonschema.py b/tests/parser/test_jsonschema.py
@@ -87,7 +87,7 @@ def test_json_schema_object_ref_url():
             """class Pets(BaseModel):
     firstName: Optional[str] = None
     lastName: Optional[str] = None
-    age: Optional[conint(ge=0.0)] = None""",
+    age: Optional[conint(ge=0)] = None""",
         )
     ],
 )

diff --git a/tests/parser/test_openapi.py b/tests/parser/test_openapi.py
@@ -875,7 +875,7 @@ class AllOfobj(BaseModel):
 
 class AllOfCombine(Pet):
     birthdate: Optional[date] = None
-    size: Optional[conint(ge=1.0)] = None
+    size: Optional[conint(ge=1)] = None
 
 
 class AnyOfCombine(Pet, Car):

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -329,7 +329,7 @@ def test_main_autodetect():
 class Person(BaseModel):
     firstName: Optional[str] = Field(None, description="The person\'s first name.")
     lastName: Optional[str] = Field(None, description="The person\'s last name.")
-    age: Optional[conint(ge=0.0)] = Field(
+    age: Optional[conint(ge=0)] = Field(
         None, description='Age in years which must be equal to or greater than zero.'
     )
     friends: Optional[List] = None
@@ -396,7 +396,7 @@ def test_main_jsonschema():
 class Person(BaseModel):
     firstName: Optional[str] = Field(None, description="The person\'s first name.")
     lastName: Optional[str] = Field(None, description="The person\'s last name.")
-    age: Optional[conint(ge=0.0)] = Field(
+    age: Optional[conint(ge=0)] = Field(
         None, description='Age in years which must be equal to or greater than zero.'
     )
     friends: Optional[List] = None