Skip to content

Commit e1fba55

Browse files
committed
Replace "class_name" schema dictionary entry with "name".
Entry into schema dictionary should contain the received attribute name, not the class_name, since class_name can be modified by the model's "title" attribute, which will break reference resolution to this model.
1 parent 8331aad commit e1fba55

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

openapi_python_client/parser/properties/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def build_model_property(
302302
name=name,
303303
additional_properties=additional_properties,
304304
)
305-
schemas = attr.evolve(schemas, models={**schemas.models, prop.reference.class_name: prop})
305+
schemas = attr.evolve(schemas, models={**schemas.models, prop.name: prop})
306306
return prop, schemas
307307

308308

@@ -374,7 +374,7 @@ def build_enum_property(
374374
values=values,
375375
value_type=value_type,
376376
)
377-
schemas = attr.evolve(schemas, enums={**schemas.enums, prop.reference.class_name: prop})
377+
schemas = attr.evolve(schemas, enums={**schemas.enums, prop.name: prop})
378378
return prop, schemas
379379

380380

tests/test_parser/test_properties/test_init.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ def test_property_from_data_str_enum(self, mocker):
510510
assert schemas != new_schemas, "Provided Schemas was mutated"
511511
assert new_schemas.enums == {
512512
"AnEnum": schemas.enums["AnEnum"],
513-
"ParentAnEnum": prop,
513+
"my_enum": prop,
514514
}
515515

516516
def test_property_from_data_int_enum(self, mocker):
@@ -541,7 +541,7 @@ def test_property_from_data_int_enum(self, mocker):
541541
assert schemas != new_schemas, "Provided Schemas was mutated"
542542
assert new_schemas.enums == {
543543
"AnEnum": schemas.enums["AnEnum"],
544-
"ParentAnEnum": prop,
544+
"my_enum": prop,
545545
}
546546

547547
def test_property_from_data_ref_enum(self):
@@ -1083,7 +1083,7 @@ def test_build_model_property(additional_properties_schema, expected_additional_
10831083
assert new_schemas != schemas
10841084
assert new_schemas.models == {
10851085
"OtherModel": None,
1086-
"ParentMyModel": model,
1086+
"prop": model,
10871087
}
10881088
assert model == ModelProperty(
10891089
name="prop",

0 commit comments

Comments
 (0)