Merge pull request #9 from koxudaxi/fix_default_arguments

fix default arguments

fastapi_code_generator/__main__.py

@@ -35,7 +35,6 @@ def main(
             template_dir if template_dir else f"{Path(__file__).parent}/template",
             encoding="utf8",
         ),
-        autoescape=True,
     )
     results: Dict[Path, str] = {}
     for target in template_dir.rglob("*"):

fastapi_code_generator/parser.py

@@ -198,8 +198,9 @@ def argument_list(self) -> List[Argument]:
     def get_parameter_type(
         self, parameter: Dict[str, Union[str, Dict[str, str]]], snake_case: bool
     ) -> str:
-        format_ = parameter["schema"].get("format", "default")  # type: ignore
-        type_ = json_schema_data_formats[parameter["schema"]["type"]][format_]  # type: ignore
+        schema: JsonSchemaObject = JsonSchemaObject.parse_obj(parameter["schema"])
+        format_ = schema.format or "default"
+        type_ = json_schema_data_formats[schema.type][format_]
         return self.get_data_type_hint(
             name=stringcase.snakecase(parameter["name"])
             if snake_case
@@ -208,6 +209,7 @@ def get_parameter_type(
             required=parameter.get("required") == "true"
             or parameter.get("in") == "path",
             snake_case=snake_case,
+            default=schema.typed_default,
         )
 
     def get_data_type_hint(
@@ -230,7 +232,8 @@ def get_data_type_hint(
 
         if not default and field.required:
             return f"{field.name}: {field.type_hint}"
-        return f'{field.name}: {field.type_hint} = {default or "None"}'
+
+        return f'{field.name}: {field.type_hint} = {default}'
 
     @cached_property
     def response(self) -> str:

pyproject.toml

@@ -28,7 +28,7 @@ fastapi-codegen = "fastapi_code_generator.__main__:app"
 [tool.poetry.dependencies]
 python = "^3.8.0"
 typer = {extras = ["all"], version =  "^0.2.1"}
-datamodel-code-generator = "^0.5.5"
+datamodel-code-generator = "^0.5.8"
 stringcase = "^1.2.0"
 black = "19.10b0"
 isort = "^4.3.21"