Skip to content

fix: Indent of generated code for non-required lists. Thanks @sfowl! #1050

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 15, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 8 additions & 0 deletions end_to_end_tests/baseline_openapi_3.0.json
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,14 @@
"title": "Some Required Number",
"type": "number"
},
"some_int_array": {
"title": "Some Integer Array",
"type": "array",
"items": {
"type": "integer",
"nullable": true
}
},
"some_array": {
"title": "Some Array",
"nullable": true,
Expand Down
7 changes: 7 additions & 0 deletions end_to_end_tests/baseline_openapi_3.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1919,6 +1919,13 @@ info:
"title": "Some Number",
"type": "number"
},
"some_int_array": {
"title": "Some Integer Array",
"type": "array",
"items": {
"type": ["integer", "null"]
}
},
"some_array": {
"title": "Some Array",
"type": [ "array", "null" ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class BodyUploadFileTestsUploadPost:
a_date (Union[Unset, datetime.date]):
some_number (Union[Unset, float]):
some_nullable_number (Union[None, Unset, float]):
some_int_array (Union[Unset, List[Union[None, int]]]):
some_array (Union[List['AFormData'], None, Unset]):
some_optional_object (Union[Unset, BodyUploadFileTestsUploadPostSomeOptionalObject]):
some_enum (Union[Unset, DifferentEnum]): An enumeration.
Expand All @@ -56,6 +57,7 @@ class BodyUploadFileTestsUploadPost:
a_date: Union[Unset, datetime.date] = UNSET
some_number: Union[Unset, float] = UNSET
some_nullable_number: Union[None, Unset, float] = UNSET
some_int_array: Union[Unset, List[Union[None, int]]] = UNSET
some_array: Union[List["AFormData"], None, Unset] = UNSET
some_optional_object: Union[Unset, "BodyUploadFileTestsUploadPostSomeOptionalObject"] = UNSET
some_enum: Union[Unset, DifferentEnum] = UNSET
Expand Down Expand Up @@ -102,6 +104,14 @@ def to_dict(self) -> Dict[str, Any]:
else:
some_nullable_number = self.some_nullable_number

some_int_array: Union[Unset, List[Union[None, int]]] = UNSET
if not isinstance(self.some_int_array, Unset):
some_int_array = []
for some_int_array_item_data in self.some_int_array:
some_int_array_item: Union[None, int]
some_int_array_item = some_int_array_item_data
some_int_array.append(some_int_array_item)

some_array: Union[List[Dict[str, Any]], None, Unset]
if isinstance(self.some_array, Unset):
some_array = UNSET
Expand Down Expand Up @@ -145,6 +155,8 @@ def to_dict(self) -> Dict[str, Any]:
field_dict["some_number"] = some_number
if some_nullable_number is not UNSET:
field_dict["some_nullable_number"] = some_nullable_number
if some_int_array is not UNSET:
field_dict["some_int_array"] = some_int_array
if some_array is not UNSET:
field_dict["some_array"] = some_array
if some_optional_object is not UNSET:
Expand Down Expand Up @@ -201,6 +213,15 @@ def to_multipart(self) -> Dict[str, Any]:
else:
some_nullable_number = (None, str(self.some_nullable_number).encode(), "text/plain")

some_int_array: Union[Unset, Tuple[None, bytes, str]] = UNSET
if not isinstance(self.some_int_array, Unset):
_temp_some_int_array = []
for some_int_array_item_data in self.some_int_array:
some_int_array_item: Union[None, int]
some_int_array_item = some_int_array_item_data
_temp_some_int_array.append(some_int_array_item)
some_int_array = (None, json.dumps(_temp_some_int_array).encode(), "application/json")

some_array: Union[Tuple[None, bytes, str], Unset]

if isinstance(self.some_array, Unset):
Expand Down Expand Up @@ -245,6 +266,8 @@ def to_multipart(self) -> Dict[str, Any]:
field_dict["some_number"] = some_number
if some_nullable_number is not UNSET:
field_dict["some_nullable_number"] = some_nullable_number
if some_int_array is not UNSET:
field_dict["some_int_array"] = some_int_array
if some_array is not UNSET:
field_dict["some_array"] = some_array
if some_optional_object is not UNSET:
Expand Down Expand Up @@ -324,6 +347,19 @@ def _parse_some_nullable_number(data: object) -> Union[None, Unset, float]:

some_nullable_number = _parse_some_nullable_number(d.pop("some_nullable_number", UNSET))

some_int_array = []
_some_int_array = d.pop("some_int_array", UNSET)
for some_int_array_item_data in _some_int_array or []:

def _parse_some_int_array_item(data: object) -> Union[None, int]:
if data is None:
return data
return cast(Union[None, int], data)

some_int_array_item = _parse_some_int_array_item(some_int_array_item_data)

some_int_array.append(some_int_array_item)

def _parse_some_array(data: object) -> Union[List["AFormData"], None, Unset]:
if data is None:
return data
Expand Down Expand Up @@ -371,6 +407,7 @@ def _parse_some_array(data: object) -> Union[List["AFormData"], None, Unset]:
a_date=a_date,
some_number=some_number,
some_nullable_number=some_nullable_number,
some_int_array=some_int_array,
some_array=some_array,
some_optional_object=some_optional_object,
some_enum=some_enum,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if not isinstance({{ source }}, Unset):
{% else %}
{{ destination }}: {{ type_string }} = UNSET
if not isinstance({{ source }}, Unset):
{{ _transform(property, source, destination, True, "to_dict") | indent(4)}}
{{ _transform(property, source, destination, True, "to_dict") | indent(4)}}
{% endif %}
{% endmacro %}

Expand Down
Loading