Skip to content

fix: Remove spurious field_dict.update({}) for types without properties #969

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

Merged
merged 5 commits into from
Feb 20, 2024
Merged

fix: Remove spurious field_dict.update({}) for types without properties #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b10f4a7
fix: bad code generated for nested unions
Feb 12, 2024
fa221a9
Merge branch 'main' into fix-nested-unions
dbanty Feb 19, 2024
9acb744
fix: Remove spurious `field_dict.update({})` for types without proper…
dbanty Feb 20, 2024
d2bbc09
chore: changeset
dbanty Feb 20, 2024
b835807
Merge branch 'main' into remove-extra-field_dict-update
dbanty Feb 20, 2024
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
2 changes: 0 additions & 2 deletions ...lient/models/an_array_with_a_circular_ref_in_items_object_additional_properties_a_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ def to_dict(self) -> Dict[str, Any]:
componentsschemas_an_array_with_a_circular_ref_in_items_object_additional_properties_b_item
)

field_dict.update({})

return field_dict

@classmethod
Expand Down
2 changes: 0 additions & 2 deletions ...lient/models/an_array_with_a_circular_ref_in_items_object_additional_properties_b_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ def to_dict(self) -> Dict[str, Any]:
componentsschemas_an_array_with_a_circular_ref_in_items_object_additional_properties_a_item
)

field_dict.update({})

return field_dict

@classmethod
Expand Down
2 changes: 0 additions & 2 deletions ...client/models/an_array_with_a_recursive_ref_in_items_object_additional_properties_item.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ def to_dict(self) -> Dict[str, Any]:
componentsschemas_an_array_with_a_recursive_ref_in_items_object_additional_properties_item
)

field_dict.update({})

return field_dict

@classmethod
Expand Down
1 change: 0 additions & 1 deletion end_to_end_tests/golden-record/my_test_api_client/models/free_form_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class FreeFormModel:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion end_to_end_tests/golden-record/my_test_api_client/models/import_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class Import:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion end_to_end_tests/golden-record/my_test_api_client/models/model_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class ModelName:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion end_to_end_tests/golden-record/my_test_api_client/models/model_reference_with_periods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class ModelReferenceWithPeriods:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...d_tests/golden-record/my_test_api_client/models/model_with_additional_properties_refed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
for prop_name, prop in self.additional_properties.items():
field_dict[prop_name] = prop.value
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def to_dict(self) -> Dict[str, Any]:

else:
field_dict[prop_name] = prop
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...rd/my_test_api_client/models/model_with_any_json_properties_additional_property_type_0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class ModelWithAnyJsonPropertiesAdditionalPropertyType0:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ..._end_tests/golden-record/my_test_api_client/models/model_with_backslash_in_description.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class ModelWithBackslashInDescription:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...en-record/my_test_api_client/models/model_with_circular_ref_in_additional_properties_a.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
for prop_name, prop in self.additional_properties.items():
field_dict[prop_name] = prop.to_dict()
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...en-record/my_test_api_client/models/model_with_circular_ref_in_additional_properties_b.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
for prop_name, prop in self.additional_properties.items():
field_dict[prop_name] = prop.to_dict()
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...ord/my_test_api_client/models/model_with_primitive_additional_properties_a_date_holder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
for prop_name, prop in self.additional_properties.items():
field_dict[prop_name] = prop.isoformat()
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...den-record/my_test_api_client/models/model_with_recursive_ref_in_additional_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
for prop_name, prop in self.additional_properties.items():
field_dict[prop_name] = prop.to_dict()
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion end_to_end_tests/golden-record/my_test_api_client/models/none.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class None_:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
1 change: 0 additions & 1 deletion ...est_api_client/models/post_responses_unions_simple_before_complex_response_200a_type_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class PostResponsesUnionsSimpleBeforeComplexResponse200AType1:
def to_dict(self) -> Dict[str, Any]:
field_dict: Dict[str, Any] = {}
field_dict.update(self.additional_properties)
field_dict.update({})

return field_dict

Expand Down
2 changes: 2 additions & 0 deletions openapi_python_client/templates/model.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,15 @@ field_dict.update({
field_dict.update(self.additional_properties)
{% endif %}
{% endif %}
{% if model.required_properties | length > 0 or model.optional_properties | length > 0 %}
field_dict.update({
{% for property in model.required_properties + model.optional_properties %}
{% if property.required %}
"{{ property.name }}": {{ property.python_name }},
{% endif %}
{% endfor %}
})
{% endif %}
{% for property in model.optional_properties %}
{% if not property.required %}
if {{ property.python_name }} is not UNSET:
Expand Down