More whitespace improvements

Author: dbanty

end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py

@@ -35,7 +35,6 @@ def _get_kwargs(
         json_null_not_required = UNSET
         if not isinstance(null_not_required, Unset):
             json_null_not_required = null_not_required.isoformat()
-
     else:
         json_null_not_required = null_not_required
 
@@ -44,7 +43,6 @@ def _get_kwargs(
     json_not_null_not_required: Union[Unset, str] = UNSET
     if not isinstance(not_null_not_required, Unset):
         json_not_null_not_required = not_null_not_required.isoformat()
-
     params["not_null_not_required"] = json_not_null_not_required
 
     params = {k: v for k, v in params.items() if v is not UNSET and v is not None}

end_to_end_tests/golden-record/my_test_api_client/models/a_form_data.py

@@ -22,6 +22,7 @@ class AFormData:
 
     def to_dict(self) -> Dict[str, Any]:
         an_required_field = self.an_required_field
+
         an_optional_field = self.an_optional_field
 
         field_dict: Dict[str, Any] = {}

end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

@@ -76,14 +76,17 @@ def to_dict(self) -> Dict[str, Any]:
         from ..models.model_with_union_property import ModelWithUnionProperty
 
         an_enum_value = self.an_enum_value.value
+
         an_allof_enum_with_overridden_default = self.an_allof_enum_with_overridden_default.value
+
         a_camel_date_time: str
         if isinstance(self.a_camel_date_time, datetime.datetime):
             a_camel_date_time = self.a_camel_date_time.isoformat()
         else:
             a_camel_date_time = self.a_camel_date_time.isoformat()
 
         a_date = self.a_date.isoformat()
+
         a_nullable_date: Union[None, str]
         if isinstance(self.a_nullable_date, datetime.date):
             a_nullable_date = self.a_nullable_date.isoformat()
@@ -94,6 +97,7 @@ def to_dict(self) -> Dict[str, Any]:
         required_nullable = self.required_nullable
 
         required_not_nullable = self.required_not_nullable
+
         one_of_models: Union[Any, Dict[str, Any]]
         if isinstance(self.one_of_models, FreeFormModel):
             one_of_models = self.one_of_models.to_dict()
@@ -111,13 +115,15 @@ def to_dict(self) -> Dict[str, Any]:
             nullable_one_of_models = self.nullable_one_of_models
 
         model = self.model.to_dict()
+
         nullable_model: Union[Dict[str, Any], None]
         if isinstance(self.nullable_model, ModelWithUnionProperty):
             nullable_model = self.nullable_model.to_dict()
         else:
             nullable_model = self.nullable_model
 
         any_value = self.any_value
+
         an_optional_allof_enum: Union[Unset, str] = UNSET
         if not isinstance(self.an_optional_allof_enum, Unset):
             an_optional_allof_enum = self.an_optional_allof_enum.value
@@ -138,14 +144,17 @@ def to_dict(self) -> Dict[str, Any]:
             a_not_required_date = self.a_not_required_date.isoformat()
 
         attr_1_leading_digit = self.attr_1_leading_digit
+
         attr_leading_underscore = self.attr_leading_underscore
+
         not_required_nullable: Union[None, Unset, str]
         if isinstance(self.not_required_nullable, Unset):
             not_required_nullable = UNSET
         else:
             not_required_nullable = self.not_required_nullable
 
         not_required_not_nullable = self.not_required_not_nullable
+
         not_required_one_of_models: Union[Dict[str, Any], Unset]
         if isinstance(self.not_required_one_of_models, Unset):
             not_required_one_of_models = UNSET
@@ -175,6 +184,7 @@ def to_dict(self) -> Dict[str, Any]:
         not_required_model: Union[Unset, Dict[str, Any]] = UNSET
         if not isinstance(self.not_required_model, Unset):
             not_required_model = self.not_required_model.to_dict()
+
         not_required_nullable_model: Union[Dict[str, Any], None, Unset]
         if isinstance(self.not_required_nullable_model, Unset):
             not_required_nullable_model = UNSET

end_to_end_tests/golden-record/my_test_api_client/models/a_model_with_properties_reference_that_are_not_object.py

@@ -154,13 +154,21 @@ def to_dict(self) -> Dict[str, Any]:
         bytestream_properties = self.bytestream_properties
 
         enum_property_ref = self.enum_property_ref.value
+
         str_property_ref = self.str_property_ref
+
         date_property_ref = self.date_property_ref.isoformat()
+
         datetime_property_ref = self.datetime_property_ref.isoformat()
+
         int32_property_ref = self.int32_property_ref
+
         int64_property_ref = self.int64_property_ref
+
         float_property_ref = self.float_property_ref
+
         double_property_ref = self.double_property_ref
+
         file_property_ref = self.file_property_ref.to_tuple()
 
         bytestream_property_ref = self.bytestream_property_ref

end_to_end_tests/golden-record/my_test_api_client/models/all_of_has_properties_but_no_type.py

@@ -25,7 +25,9 @@ class AllOfHasPropertiesButNoType:
 
     def to_dict(self) -> Dict[str, Any]:
         a_sub_property = self.a_sub_property
+
         type = self.type
+
         type_enum: Union[Unset, int] = UNSET
         if not isinstance(self.type_enum, Unset):
             type_enum = self.type_enum.value

end_to_end_tests/golden-record/my_test_api_client/models/all_of_sub_model.py

@@ -25,7 +25,9 @@ class AllOfSubModel:
 
     def to_dict(self) -> Dict[str, Any]:
         a_sub_property = self.a_sub_property
+
         type = self.type
+
         type_enum: Union[Unset, int] = UNSET
         if not isinstance(self.type_enum, Unset):
             type_enum = self.type_enum.value

end_to_end_tests/golden-record/my_test_api_client/models/another_all_of_sub_model.py

@@ -26,6 +26,7 @@ class AnotherAllOfSubModel:
 
     def to_dict(self) -> Dict[str, Any]:
         another_sub_property = self.another_sub_property
+
         type: Union[Unset, str] = UNSET
         if not isinstance(self.type, Unset):
             type = self.type.value

end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -66,6 +66,7 @@ def to_dict(self) -> Dict[str, Any]:
         some_file = self.some_file.to_tuple()
 
         some_object = self.some_object.to_dict()
+
         some_nullable_object: Union[Dict[str, Any], None]
         if isinstance(self.some_nullable_object, BodyUploadFileTestsUploadPostSomeNullableObject):
             some_nullable_object = self.some_nullable_object.to_dict()
@@ -77,6 +78,7 @@ def to_dict(self) -> Dict[str, Any]:
             some_optional_file = self.some_optional_file.to_tuple()
 
         some_string = self.some_string
+
         a_datetime: Union[Unset, str] = UNSET
         if not isinstance(self.a_datetime, Unset):
             a_datetime = self.a_datetime.isoformat()
@@ -86,13 +88,15 @@ def to_dict(self) -> Dict[str, Any]:
             a_date = self.a_date.isoformat()
 
         some_number = self.some_number
+
         some_array: Union[Unset, List[float]] = UNSET
         if not isinstance(self.some_array, Unset):
             some_array = self.some_array
 
         some_optional_object: Union[Unset, Dict[str, Any]] = UNSET
         if not isinstance(self.some_optional_object, Unset):
             some_optional_object = self.some_optional_object.to_dict()
+
         some_enum: Union[Unset, str] = UNSET
         if not isinstance(self.some_enum, Unset):
             some_enum = self.some_enum.value
@@ -130,6 +134,7 @@ def to_multipart(self) -> Dict[str, Any]:
         some_file = self.some_file.to_tuple()
 
         some_object = (None, json.dumps(self.some_object.to_dict()).encode(), "application/json")
+
         some_nullable_object: Union[None, Tuple[None, bytes, str]]
         if isinstance(self.some_nullable_object, BodyUploadFileTestsUploadPostSomeNullableObject):
             some_nullable_object = (None, json.dumps(self.some_nullable_object.to_dict()).encode(), "application/json")
@@ -145,6 +150,7 @@ def to_multipart(self) -> Dict[str, Any]:
             if isinstance(self.some_string, Unset)
             else (None, str(self.some_string).encode(), "text/plain")
         )
+
         a_datetime: Union[Unset, bytes] = UNSET
         if not isinstance(self.a_datetime, Unset):
             a_datetime = self.a_datetime.isoformat().encode()
@@ -158,6 +164,7 @@ def to_multipart(self) -> Dict[str, Any]:
             if isinstance(self.some_number, Unset)
             else (None, str(self.some_number).encode(), "text/plain")
         )
+
         some_array: Union[Unset, Tuple[None, bytes, str]] = UNSET
         if not isinstance(self.some_array, Unset):
             _temp_some_array = self.some_array
@@ -166,6 +173,7 @@ def to_multipart(self) -> Dict[str, Any]:
         some_optional_object: Union[Unset, Tuple[None, bytes, str]] = UNSET
         if not isinstance(self.some_optional_object, Unset):
             some_optional_object = (None, json.dumps(self.some_optional_object.to_dict()).encode(), "application/json")
+
         some_enum: Union[Unset, Tuple[None, bytes, str]] = UNSET
         if not isinstance(self.some_enum, Unset):
             some_enum = (None, str(self.some_enum.value).encode(), "text/plain")

end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post_some_object.py

@@ -20,6 +20,7 @@ class BodyUploadFileTestsUploadPostSomeObject:
 
     def to_dict(self) -> Dict[str, Any]:
         num = self.num
+
         text = self.text
 
         field_dict: Dict[str, Any] = {}

end_to_end_tests/golden-record/my_test_api_client/models/model_from_all_of.py

@@ -28,6 +28,7 @@ class ModelFromAllOf:
 
     def to_dict(self) -> Dict[str, Any]:
         a_sub_property = self.a_sub_property
+
         type: Union[Unset, str] = UNSET
         if not isinstance(self.type, Unset):
             type = self.type.value

end_to_end_tests/golden-record/my_test_api_client/models/post_form_data_inline_data.py

@@ -22,6 +22,7 @@ class PostFormDataInlineData:
 
     def to_dict(self) -> Dict[str, Any]:
         a_required_field = self.a_required_field
+
         an_optional_field = self.an_optional_field
 
         field_dict: Dict[str, Any] = {}

end_to_end_tests/golden-record/my_test_api_client/models/post_naming_property_conflict_with_import_json_body.py

@@ -22,6 +22,7 @@ class PostNamingPropertyConflictWithImportJsonBody:
 
     def to_dict(self) -> Dict[str, Any]:
         field = self.field
+
         define = self.define
 
         field_dict: Dict[str, Any] = {}

end_to_end_tests/golden-record/my_test_api_client/models/post_naming_property_conflict_with_import_response_200.py

@@ -22,6 +22,7 @@ class PostNamingPropertyConflictWithImportResponse200:
 
     def to_dict(self) -> Dict[str, Any]:
         field = self.field
+
         define = self.define
 
         field_dict: Dict[str, Any] = {}

end_to_end_tests/golden-record/my_test_api_client/models/validation_error.py

@@ -22,6 +22,7 @@ def to_dict(self) -> Dict[str, Any]:
         loc = self.loc
 
         msg = self.msg
+
         type = self.type
 
         field_dict: Dict[str, Any] = {}

end_to_end_tests/test-3-1-golden-record/test_3_1_features_client/models/post_const_path_json_body.py

@@ -24,6 +24,7 @@ class PostConstPathJsonBody:
 
     def to_dict(self) -> Dict[str, Any]:
         required = self.required
+
         nullable: Union[Literal["this or null goes in the body"], None]
         nullable = self.nullable
 

integration-tests/integration_tests/models/post_body_multipart_multipart_data.py

@@ -26,6 +26,7 @@ class PostBodyMultipartMultipartData:
 
     def to_dict(self) -> Dict[str, Any]:
         a_string = self.a_string
+
         file = self.file.to_tuple()
 
         description = self.description
@@ -47,6 +48,7 @@ def to_multipart(self) -> Dict[str, Any]:
         a_string = (
             self.a_string if isinstance(self.a_string, Unset) else (None, str(self.a_string).encode(), "text/plain")
         )
+
         file = self.file.to_tuple()
 
         description = (

integration-tests/integration_tests/models/post_body_multipart_response_200.py

@@ -26,9 +26,13 @@ class PostBodyMultipartResponse200:
 
     def to_dict(self) -> Dict[str, Any]:
         a_string = self.a_string
+
         file_data = self.file_data
+
         description = self.description
+
         file_name = self.file_name
+
         file_content_type = self.file_content_type
 
         field_dict: Dict[str, Any] = {}

integration-tests/integration_tests/models/post_parameters_header_response_200.py

@@ -24,8 +24,11 @@ class PostParametersHeaderResponse200:
 
     def to_dict(self) -> Dict[str, Any]:
         boolean = self.boolean
+
         string = self.string
+
         number = self.number
+
         integer = self.integer
 
         field_dict: Dict[str, Any] = {}

integration-tests/integration_tests/models/problem.py

@@ -22,6 +22,7 @@ class Problem:
 
     def to_dict(self) -> Dict[str, Any]:
         parameter_name = self.parameter_name
+
         description = self.description
 
         field_dict: Dict[str, Any] = {}

openapi_python_client/templates/endpoint_macros.py.jinja

@@ -32,6 +32,7 @@ cookies["{{ parameter.name}}"] = {{ parameter.python_name }}
 if {{ parameter.python_name }} is not UNSET:
     cookies["{{ parameter.name}}"] = {{ parameter.python_name }}
         {% endif %}
+
     {% endfor %}
 {% endif %}
 {% endmacro %}
@@ -53,7 +54,6 @@ params["{{ property.name }}"] = {{ destination }}
 {{ guarded_statement(property, destination, "params.update(" + destination + ")") }}
     {% endif %}
 
-
 {% endfor %}
 
 params = {k: v for k, v in params.items() if v is not UNSET and v is not None}

openapi_python_client/templates/model.py.jinja

@@ -87,6 +87,7 @@ class {{ class_name }}:
 {% else %}
 {{ property.python_name }} = self.{{ property.python_name }}
 {% endif %}
+
 {% endfor %}
 
 field_dict: Dict[str, Any] = {}

openapi_python_client/templates/property_templates/date_property.py.jinja

@@ -27,5 +27,5 @@ isoparse({{ source }}).date()
 {% endif %}
 if not isinstance({{ source }}, Unset):
     {{ destination }} = {{ transformed }}
-{% endif %}
+{%- endif %}
 {% endmacro %}

openapi_python_client/templates/property_templates/datetime_property.py.jinja

@@ -27,5 +27,5 @@ isoparse({{ source }})
 {% endif %}
 if not isinstance({{ source }}, Unset):
     {{ destination }} = {{ transformed }}
-{% endif %}
+{%- endif %}
 {% endmacro %}