Skip to content

Commit e1ef9a7

Browse files
packygpackyg
committed
Rename AdditionalProperties models to AdditionalProperty as each one is singular
1 parent 036f372 commit e1ef9a7

13 files changed

+55
-55
lines changed

‎end_to_end_tests/golden-record-custom/custom_e2e/models/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from .free_form_model import FreeFormModel
99
from .http_validation_error import HTTPValidationError
1010
from .model_with_additional_properties_inlined import ModelWithAdditionalPropertiesInlined
11-
from .model_with_additional_properties_inlined_additional_properties import (
12-
ModelWithAdditionalPropertiesInlinedAdditionalProperties,
11+
from .model_with_additional_properties_inlined_additional_property import (
12+
ModelWithAdditionalPropertiesInlinedAdditionalProperty,
1313
)
1414
from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
1515
from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_additional_properties_inlined.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import attr
44

5-
from ..models.model_with_additional_properties_inlined_additional_properties import (
6-
ModelWithAdditionalPropertiesInlinedAdditionalProperties,
5+
from ..models.model_with_additional_properties_inlined_additional_property import (
6+
ModelWithAdditionalPropertiesInlinedAdditionalProperty,
77
)
88
from ..types import UNSET, Unset
99

@@ -13,7 +13,7 @@ class ModelWithAdditionalPropertiesInlined:
1313
""" """
1414

1515
a_number: Union[Unset, float] = UNSET
16-
additional_properties: Dict[str, ModelWithAdditionalPropertiesInlinedAdditionalProperties] = attr.ib(
16+
additional_properties: Dict[str, ModelWithAdditionalPropertiesInlinedAdditionalProperty] = attr.ib(
1717
init=False, factory=dict
1818
)
1919

@@ -39,23 +39,23 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlined
3939
a_number=a_number,
4040
)
4141

42-
additional_properties_dict = {}
42+
additional_properties = {}
4343
for prop_name, prop_dict in d.items():
44-
additional_properties = ModelWithAdditionalPropertiesInlinedAdditionalProperties.from_dict(prop_dict)
44+
additional_property = ModelWithAdditionalPropertiesInlinedAdditionalProperty.from_dict(prop_dict)
4545

46-
additional_properties_dict[prop_name] = additional_properties
46+
additional_properties[prop_name] = additional_property
4747

48-
model_with_additional_properties_inlined.additional_properties = additional_properties_dict
48+
model_with_additional_properties_inlined.additional_properties = additional_properties
4949
return model_with_additional_properties_inlined
5050

5151
@property
5252
def additional_keys(self) -> List[str]:
5353
return list(self.additional_properties.keys())
5454

55-
def __getitem__(self, key: str) -> ModelWithAdditionalPropertiesInlinedAdditionalProperties:
55+
def __getitem__(self, key: str) -> ModelWithAdditionalPropertiesInlinedAdditionalProperty:
5656
return self.additional_properties[key]
5757

58-
def __setitem__(self, key: str, value: ModelWithAdditionalPropertiesInlinedAdditionalProperties) -> None:
58+
def __setitem__(self, key: str, value: ModelWithAdditionalPropertiesInlinedAdditionalProperty) -> None:
5959
self.additional_properties[key] = value
6060

6161
def __delitem__(self, key: str) -> None:

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_additional_properties_inlined_additional_properties.py renamed to ‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_additional_properties_inlined_additional_property.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
@attr.s(auto_attribs=True)
9-
class ModelWithAdditionalPropertiesInlinedAdditionalProperties:
9+
class ModelWithAdditionalPropertiesInlinedAdditionalProperty:
1010
""" """
1111

1212
extra_props_prop: Union[Unset, str] = UNSET
@@ -24,18 +24,18 @@ def to_dict(self) -> Dict[str, Any]:
2424
return field_dict
2525

2626
@staticmethod
27-
def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlinedAdditionalProperties":
27+
def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlinedAdditionalProperty":
2828
d = src_dict.copy()
2929
extra_props_prop = d.pop("extra_props_prop", UNSET)
3030

31-
model_with_additional_properties_inlined_additional_properties = (
32-
ModelWithAdditionalPropertiesInlinedAdditionalProperties(
31+
model_with_additional_properties_inlined_additional_property = (
32+
ModelWithAdditionalPropertiesInlinedAdditionalProperty(
3333
extra_props_prop=extra_props_prop,
3434
)
3535
)
3636

37-
model_with_additional_properties_inlined_additional_properties.additional_properties = d
38-
return model_with_additional_properties_inlined_additional_properties
37+
model_with_additional_properties_inlined_additional_property.additional_properties = d
38+
return model_with_additional_properties_inlined_additional_property
3939

4040
@property
4141
def additional_keys(self) -> List[str]:

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_additional_properties_refed.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesRefed":
2626
d = src_dict.copy()
2727
model_with_additional_properties_refed = ModelWithAdditionalPropertiesRefed()
2828

29-
additional_properties_dict = {}
29+
additional_properties = {}
3030
for prop_name, prop_dict in d.items():
31-
additional_properties = AnEnum(prop_dict)
31+
additional_property = AnEnum(prop_dict)
3232

33-
additional_properties_dict[prop_name] = additional_properties
33+
additional_properties[prop_name] = additional_property
3434

35-
model_with_additional_properties_refed.additional_properties = additional_properties_dict
35+
model_with_additional_properties_refed.additional_properties = additional_properties
3636
return model_with_additional_properties_refed
3737

3838
@property

‎end_to_end_tests/golden-record-custom/custom_e2e/models/model_with_primitive_additional_properties_a_date_holder.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithPrimitiveAdditionalProperti
2626
d = src_dict.copy()
2727
model_with_primitive_additional_properties_a_date_holder = ModelWithPrimitiveAdditionalPropertiesADateHolder()
2828

29-
additional_properties_dict = {}
29+
additional_properties = {}
3030
for prop_name, prop_dict in d.items():
31-
additional_properties = isoparse(prop_dict)
31+
additional_property = isoparse(prop_dict)
3232

33-
additional_properties_dict[prop_name] = additional_properties
33+
additional_properties[prop_name] = additional_property
3434

35-
model_with_primitive_additional_properties_a_date_holder.additional_properties = additional_properties_dict
35+
model_with_primitive_additional_properties_a_date_holder.additional_properties = additional_properties
3636
return model_with_primitive_additional_properties_a_date_holder
3737

3838
@property

‎end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from .free_form_model import FreeFormModel
99
from .http_validation_error import HTTPValidationError
1010
from .model_with_additional_properties_inlined import ModelWithAdditionalPropertiesInlined
11-
from .model_with_additional_properties_inlined_additional_properties import (
12-
ModelWithAdditionalPropertiesInlinedAdditionalProperties,
11+
from .model_with_additional_properties_inlined_additional_property import (
12+
ModelWithAdditionalPropertiesInlinedAdditionalProperty,
1313
)
1414
from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
1515
from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties

‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_additional_properties_inlined.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import attr
44

5-
from ..models.model_with_additional_properties_inlined_additional_properties import (
6-
ModelWithAdditionalPropertiesInlinedAdditionalProperties,
5+
from ..models.model_with_additional_properties_inlined_additional_property import (
6+
ModelWithAdditionalPropertiesInlinedAdditionalProperty,
77
)
88
from ..types import UNSET, Unset
99

@@ -13,7 +13,7 @@ class ModelWithAdditionalPropertiesInlined:
1313
""" """
1414

1515
a_number: Union[Unset, float] = UNSET
16-
additional_properties: Dict[str, ModelWithAdditionalPropertiesInlinedAdditionalProperties] = attr.ib(
16+
additional_properties: Dict[str, ModelWithAdditionalPropertiesInlinedAdditionalProperty] = attr.ib(
1717
init=False, factory=dict
1818
)
1919

@@ -39,23 +39,23 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlined
3939
a_number=a_number,
4040
)
4141

42-
additional_properties_dict = {}
42+
additional_properties = {}
4343
for prop_name, prop_dict in d.items():
44-
additional_properties = ModelWithAdditionalPropertiesInlinedAdditionalProperties.from_dict(prop_dict)
44+
additional_property = ModelWithAdditionalPropertiesInlinedAdditionalProperty.from_dict(prop_dict)
4545

46-
additional_properties_dict[prop_name] = additional_properties
46+
additional_properties[prop_name] = additional_property
4747

48-
model_with_additional_properties_inlined.additional_properties = additional_properties_dict
48+
model_with_additional_properties_inlined.additional_properties = additional_properties
4949
return model_with_additional_properties_inlined
5050

5151
@property
5252
def additional_keys(self) -> List[str]:
5353
return list(self.additional_properties.keys())
5454

55-
def __getitem__(self, key: str) -> ModelWithAdditionalPropertiesInlinedAdditionalProperties:
55+
def __getitem__(self, key: str) -> ModelWithAdditionalPropertiesInlinedAdditionalProperty:
5656
return self.additional_properties[key]
5757

58-
def __setitem__(self, key: str, value: ModelWithAdditionalPropertiesInlinedAdditionalProperties) -> None:
58+
def __setitem__(self, key: str, value: ModelWithAdditionalPropertiesInlinedAdditionalProperty) -> None:
5959
self.additional_properties[key] = value
6060

6161
def __delitem__(self, key: str) -> None:

‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_additional_properties_inlined_additional_properties.py renamed to ‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_additional_properties_inlined_additional_property.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
@attr.s(auto_attribs=True)
9-
class ModelWithAdditionalPropertiesInlinedAdditionalProperties:
9+
class ModelWithAdditionalPropertiesInlinedAdditionalProperty:
1010
""" """
1111

1212
extra_props_prop: Union[Unset, str] = UNSET
@@ -24,18 +24,18 @@ def to_dict(self) -> Dict[str, Any]:
2424
return field_dict
2525

2626
@staticmethod
27-
def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlinedAdditionalProperties":
27+
def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesInlinedAdditionalProperty":
2828
d = src_dict.copy()
2929
extra_props_prop = d.pop("extra_props_prop", UNSET)
3030

31-
model_with_additional_properties_inlined_additional_properties = (
32-
ModelWithAdditionalPropertiesInlinedAdditionalProperties(
31+
model_with_additional_properties_inlined_additional_property = (
32+
ModelWithAdditionalPropertiesInlinedAdditionalProperty(
3333
extra_props_prop=extra_props_prop,
3434
)
3535
)
3636

37-
model_with_additional_properties_inlined_additional_properties.additional_properties = d
38-
return model_with_additional_properties_inlined_additional_properties
37+
model_with_additional_properties_inlined_additional_property.additional_properties = d
38+
return model_with_additional_properties_inlined_additional_property
3939

4040
@property
4141
def additional_keys(self) -> List[str]:

‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_additional_properties_refed.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithAdditionalPropertiesRefed":
2626
d = src_dict.copy()
2727
model_with_additional_properties_refed = ModelWithAdditionalPropertiesRefed()
2828

29-
additional_properties_dict = {}
29+
additional_properties = {}
3030
for prop_name, prop_dict in d.items():
31-
additional_properties = AnEnum(prop_dict)
31+
additional_property = AnEnum(prop_dict)
3232

33-
additional_properties_dict[prop_name] = additional_properties
33+
additional_properties[prop_name] = additional_property
3434

35-
model_with_additional_properties_refed.additional_properties = additional_properties_dict
35+
model_with_additional_properties_refed.additional_properties = additional_properties
3636
return model_with_additional_properties_refed
3737

3838
@property

‎end_to_end_tests/golden-record/my_test_api_client/models/model_with_primitive_additional_properties_a_date_holder.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ def from_dict(src_dict: Dict[str, Any]) -> "ModelWithPrimitiveAdditionalProperti
2626
d = src_dict.copy()
2727
model_with_primitive_additional_properties_a_date_holder = ModelWithPrimitiveAdditionalPropertiesADateHolder()
2828

29-
additional_properties_dict = {}
29+
additional_properties = {}
3030
for prop_name, prop_dict in d.items():
31-
additional_properties = isoparse(prop_dict)
31+
additional_property = isoparse(prop_dict)
3232

33-
additional_properties_dict[prop_name] = additional_properties
33+
additional_properties[prop_name] = additional_property
3434

35-
model_with_primitive_additional_properties_a_date_holder.additional_properties = additional_properties_dict
35+
model_with_primitive_additional_properties_a_date_holder.additional_properties = additional_properties
3636
return model_with_primitive_additional_properties_a_date_holder
3737

3838
@property

‎openapi_python_client/parser/properties/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def build_model_property(
266266
else:
267267
assert isinstance(data.additionalProperties, (oai.Schema, oai.Reference))
268268
additional_properties, schemas = property_from_data(
269-
name="AdditionalProperties",
269+
name="AdditionalProperty",
270270
required=True, # in the sense that if present in the dict will not be None
271271
data=data.additionalProperties,
272272
schemas=schemas,

‎openapi_python_client/templates/model.pyi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ class {{ model.reference.class_name }}:
9898
{% if model.additional_properties %}
9999
{% if model.additional_properties.template %}
100100
{% from "property_templates/" + model.additional_properties.template import construct %}
101-
additional_properties_dict = {}
101+
additional_properties = {}
102102
for prop_name, prop_dict in d.items():
103103
{{ construct(model.additional_properties, "prop_dict") | indent(12) }}
104-
additional_properties_dict[prop_name] = {{ model.additional_properties.python_name }}
104+
additional_properties[prop_name] = {{ model.additional_properties.python_name }}
105105

106-
{{model.reference.module_name}}.additional_properties = additional_properties_dict
106+
{{model.reference.module_name}}.additional_properties = additional_properties
107107
{% else %}
108108
{{model.reference.module_name}}.additional_properties = d
109109
{% endif %}

‎tests/test_parser/test_properties/test_init.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ def test_build_enums(mocker):
10501050
(False, False),
10511051
(
10521052
oai.Schema.construct(type="string"),
1053-
StringProperty(name="AdditionalProperties", required=True, nullable=False, default=None),
1053+
StringProperty(name="AdditionalProperty", required=True, nullable=False, default=None),
10541054
),
10551055
],
10561056
)

0 commit comments

Comments
 (0)