[python] change Private attr to Class vars (#16687)

* [python] fix TypeError

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python] update Private model attributes to Class vars

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python] rename the List of test cases to ListClass

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python] update samples

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python] rename the List of v1 test cases to ListClass

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python] rename the List of v1-aiohttp test cases to ListClass

Signed-off-by: ふぁ <yuki@yuki0311.com>

* update samples

---------

Signed-off-by: ふぁ <yuki@yuki0311.com>
Co-authored-by: William Cheng <wing328hk@gmail.com>

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java

@@ -948,7 +948,9 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
                     && !model.isEnum
                     && !this.disallowAdditionalPropertiesIfNotPresent) {
                 typingImports.add("Dict");
+                typingImports.add("List");
                 typingImports.add("Any");
+                typingImports.add("ClassVar");
             }
 
             //loop through properties/schemas to set up typing, pydantic

modules/openapi-generator/src/main/resources/python/model_generic.mustache

@@ -23,7 +23,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 {{#isAdditionalPropertiesTrue}}
     additional_properties: Dict[str, Any] = {}
 {{/isAdditionalPropertiesTrue}}
-    __properties = [{{#allVars}}"{{baseName}}"{{^-last}}, {{/-last}}{{/allVars}}]
+    __properties: ClassVar[List[str]] = [{{#allVars}}"{{baseName}}"{{^-last}}, {{/-last}}{{/allVars}}]
 {{#vars}}
     {{#vendorExtensions.x-regex}}
 
@@ -85,27 +85,21 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 {{#hasChildren}}
 {{#discriminator}}
     # JSON field name that stores the object type
-    __discriminator_property_name = '{{discriminator.propertyBaseName}}'
+    __discriminator_property_name: ClassVar[List[str]] = '{{discriminator.propertyBaseName}}'
 
-    {{#mappedModels}}
-    {{#-first}}
     # discriminator mappings
-    __discriminator_value_class_map = {
-    {{/-first}}
-        '{{{mappingName}}}': '{{{modelName}}}'{{^-last}},{{/-last}}
-    {{#-last}}
+    __discriminator_value_class_map: ClassVar[Dict[str, str]] = {
+        {{#mappedModels}}'{{{mappingName}}}': '{{{modelName}}}'{{^-last}},{{/-last}}{{/mappedModels}}
     }
 
     @classmethod
     def get_discriminator_value(cls, obj: dict) -> str:
         """Returns the discriminator value (object type) of the data"""
-        discriminator_value = obj[cls.__discriminator_property_name.default]
+        discriminator_value = obj[cls.__discriminator_property_name]
         if discriminator_value:
-            return cls.__discriminator_value_class_map.default.get(discriminator_value)
+            return cls.__discriminator_value_class_map.get(discriminator_value)
         else:
             return None
-    {{/-last}}
-    {{/mappedModels}}
 
 {{/discriminator}}
 {{/hasChildren}}
@@ -232,8 +226,8 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             return klass.from_dict(obj)
         else:
             raise ValueError("{{{classname}}} failed to lookup discriminator value from " +
-                             json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name.default +
-                             ", mapping: " + json.dumps(cls.__discriminator_value_class_map.default))
+                             json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
+                             ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
         {{/discriminator}}
         {{/hasChildren}}
         {{^hasChildren}}
@@ -248,7 +242,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         # raise errors for additional fields in the input
         for _key in obj.keys():
             if _key not in cls.__properties:
-                raise ValueError("Error due to additional fields (not defined in {{classname}}) in the input: " + obj)
+                raise ValueError("Error due to additional fields (not defined in {{classname}}) in the input: " + _key)
 
         {{/isAdditionalPropertiesTrue}}
         {{/disallowAdditionalPropertiesIfNotPresent}}
@@ -351,7 +345,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         {{#isAdditionalPropertiesTrue}}
         # store additional fields in additional_properties
         for _key in obj.keys():
-            if _key not in cls.__properties.default:
+            if _key not in cls.__properties:
                 _obj.additional_properties[_key] = obj.get(_key)
 
         {{/isAdditionalPropertiesTrue}}

modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1776,7 +1776,7 @@ components:
           type: object
           additionalProperties:
             $ref: '#/components/schemas/Animal'
-    List:
+    ListClass:
       type: object
       properties:
         123-list:

samples/client/echo_api/python/openapi_client/models/bird.py

@@ -28,7 +28,7 @@ class Bird(BaseModel):
     """
     size: Optional[StrictStr] = None
     color: Optional[StrictStr] = None
-    __properties = ["size", "color"]
+    __properties: ClassVar[List[str]] = ["size", "color"]
 
     model_config = {
         "populate_by_name": True,

samples/client/echo_api/python/openapi_client/models/category.py

@@ -28,7 +28,7 @@ class Category(BaseModel):
     """
     id: Optional[StrictInt] = None
     name: Optional[StrictStr] = None
-    __properties = ["id", "name"]
+    __properties: ClassVar[List[str]] = ["id", "name"]
 
     model_config = {
         "populate_by_name": True,

samples/client/echo_api/python/openapi_client/models/data_query.py

@@ -31,7 +31,7 @@ class DataQuery(Query):
     suffix: Optional[StrictStr] = Field(default=None, description="test suffix")
     text: Optional[StrictStr] = Field(default=None, description="Some text containing white spaces")
     var_date: Optional[datetime] = Field(default=None, description="A date", alias="date")
-    __properties = ["id", "outcomes", "suffix", "text", "date"]
+    __properties: ClassVar[List[str]] = ["id", "outcomes", "suffix", "text", "date"]
 
     model_config = {
         "populate_by_name": True,

samples/client/echo_api/python/openapi_client/models/default_value.py

@@ -35,7 +35,7 @@ class DefaultValue(BaseModel):
     array_string_nullable: Optional[List[StrictStr]] = None
     array_string_extension_nullable: Optional[List[StrictStr]] = None
     string_nullable: Optional[StrictStr] = None
-    __properties = ["array_string_enum_ref_default", "array_string_enum_default", "array_string_default", "array_integer_default", "array_string", "array_string_nullable", "array_string_extension_nullable", "string_nullable"]
+    __properties: ClassVar[List[str]] = ["array_string_enum_ref_default", "array_string_enum_default", "array_string_default", "array_integer_default", "array_string", "array_string_nullable", "array_string_extension_nullable", "string_nullable"]
 
     @field_validator('array_string_enum_default')
     def array_string_enum_default_validate_enum(cls, value):

samples/client/echo_api/python/openapi_client/models/number_properties_only.py

@@ -30,7 +30,7 @@ class NumberPropertiesOnly(BaseModel):
     """
     number: Optional[Union[StrictFloat, StrictInt]] = None
     double: Optional[Union[Annotated[float, Field(le=50.2, strict=True, ge=0.8)], Annotated[int, Field(le=50, strict=True, ge=1)]]] = None
-    __properties = ["number", "double"]
+    __properties: ClassVar[List[str]] = ["number", "double"]
 
     model_config = {
         "populate_by_name": True,

samples/client/echo_api/python/openapi_client/models/pet.py

@@ -35,7 +35,7 @@ class Pet(BaseModel):
     photo_urls: List[StrictStr] = Field(alias="photoUrls")
     tags: Optional[List[Tag]] = None
     status: Optional[StrictStr] = Field(default=None, description="pet status in the store")
-    __properties = ["id", "name", "category", "photoUrls", "tags", "status"]
+    __properties: ClassVar[List[str]] = ["id", "name", "category", "photoUrls", "tags", "status"]
 
     @field_validator('status')
     def status_validate_enum(cls, value):

samples/client/echo_api/python/openapi_client/models/query.py

@@ -29,7 +29,7 @@ class Query(BaseModel):
     """
     id: Optional[StrictInt] = Field(default=None, description="Query")
     outcomes: Optional[List[StrictStr]] = None
-    __properties = ["id", "outcomes"]
+    __properties: ClassVar[List[str]] = ["id", "outcomes"]
 
     @field_validator('outcomes')
     def outcomes_validate_enum(cls, value):

samples/client/echo_api/python/openapi_client/models/tag.py

@@ -28,7 +28,7 @@ class Tag(BaseModel):
     """
     id: Optional[StrictInt] = None
     name: Optional[StrictStr] = None
-    __properties = ["id", "name"]
+    __properties: ClassVar[List[str]] = ["id", "name"]
 
     model_config = {
         "populate_by_name": True,

samples/client/echo_api/python/openapi_client/models/test_query_style_deep_object_explode_true_object_all_of_query_object_parameter.py

@@ -30,7 +30,7 @@ class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter(BaseMod
     color: Optional[StrictStr] = None
     id: Optional[StrictInt] = None
     name: Optional[StrictStr] = None
-    __properties = ["size", "color", "id", "name"]
+    __properties: ClassVar[List[str]] = ["size", "color", "id", "name"]
 
     model_config = {
         "populate_by_name": True,

samples/client/echo_api/python/openapi_client/models/test_query_style_form_explode_true_array_string_query_object_parameter.py

@@ -27,7 +27,7 @@ class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter(BaseModel):
     TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
     """
     values: Optional[List[StrictStr]] = None
-    __properties = ["values"]
+    __properties: ClassVar[List[str]] = ["values"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES

@@ -49,7 +49,7 @@ docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
 docs/InnerDictWithProperty.md
 docs/IntOrString.md
-docs/List.md
+docs/ListClass.md
 docs/MapOfArrayOfModel.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -146,7 +146,7 @@ petstore_api/models/has_only_read_only.py
 petstore_api/models/health_check_result.py
 petstore_api/models/inner_dict_with_property.py
 petstore_api/models/int_or_string.py
-petstore_api/models/list.py
+petstore_api/models/list_class.py
 petstore_api/models/map_of_array_of_model.py
 petstore_api/models/map_test.py
 petstore_api/models/mixed_properties_and_additional_properties_class.py

samples/openapi3/client/petstore/python-aiohttp/README.md

@@ -177,7 +177,7 @@ Class | Method | HTTP request | Description
  - [HealthCheckResult](docs/HealthCheckResult.md)
  - [InnerDictWithProperty](docs/InnerDictWithProperty.md)
  - [IntOrString](docs/IntOrString.md)
- - [List](docs/List.md)
+ - [ListClass](docs/ListClass.md)
  - [MapOfArrayOfModel](docs/MapOfArrayOfModel.md)
  - [MapTest](docs/MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)

samples/openapi3/client/petstore/python-aiohttp/docs/ListClass.md

@@ -0,0 +1,28 @@
+# ListClass
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**var_123_list** | **str** |  | [optional] 
+
+## Example
+
+```python
+from petstore_api.models.list_class import ListClass
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ListClass from a JSON string
+list_class_instance = ListClass.from_json(json)
+# print the JSON string representation of the object
+print ListClass.to_json()
+
+# convert the object into a dict
+list_class_dict = list_class_instance.to_dict()
+# create an instance of ListClass from a dict
+list_class_form_dict = list_class.from_dict(list_class_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py

@@ -80,7 +80,7 @@ from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 from petstore_api.models.int_or_string import IntOrString
-from petstore_api.models.list import List
+from petstore_api.models.list_class import ListClass
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel
 from petstore_api.models.map_test import MapTest
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py

@@ -56,7 +56,7 @@ from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 from petstore_api.models.int_or_string import IntOrString
-from petstore_api.models.list import List
+from petstore_api.models.list_class import ListClass
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel
 from petstore_api.models.map_test import MapTest
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_any_type.py

@@ -27,7 +27,7 @@ class AdditionalPropertiesAnyType(BaseModel):
     """
     name: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["name"]
+    __properties: ClassVar[List[str]] = ["name"]
 
     model_config = {
         "populate_by_name": True,
@@ -77,7 +77,7 @@ class AdditionalPropertiesAnyType(BaseModel):
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
-            if _key not in cls.__properties.default:
+            if _key not in cls.__properties:
                 _obj.additional_properties[_key] = obj.get(_key)
 
         return _obj

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_class.py

@@ -27,7 +27,7 @@ class AdditionalPropertiesClass(BaseModel):
     """
     map_property: Optional[Dict[str, StrictStr]] = None
     map_of_map_property: Optional[Dict[str, Dict[str, StrictStr]]] = None
-    __properties = ["map_property", "map_of_map_property"]
+    __properties: ClassVar[List[str]] = ["map_property", "map_of_map_property"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_object.py

@@ -27,7 +27,7 @@ class AdditionalPropertiesObject(BaseModel):
     """
     name: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["name"]
+    __properties: ClassVar[List[str]] = ["name"]
 
     model_config = {
         "populate_by_name": True,
@@ -77,7 +77,7 @@ class AdditionalPropertiesObject(BaseModel):
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
-            if _key not in cls.__properties.default:
+            if _key not in cls.__properties:
                 _obj.additional_properties[_key] = obj.get(_key)
 
         return _obj

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/additional_properties_with_description_only.py

@@ -27,7 +27,7 @@ class AdditionalPropertiesWithDescriptionOnly(BaseModel):
     """
     name: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["name"]
+    __properties: ClassVar[List[str]] = ["name"]
 
     model_config = {
         "populate_by_name": True,
@@ -77,7 +77,7 @@ class AdditionalPropertiesWithDescriptionOnly(BaseModel):
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
-            if _key not in cls.__properties.default:
+            if _key not in cls.__properties:
                 _obj.additional_properties[_key] = obj.get(_key)
 
         return _obj

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/all_of_with_single_ref.py

@@ -29,7 +29,7 @@ class AllOfWithSingleRef(BaseModel):
     """
     username: Optional[StrictStr] = None
     single_ref_type: Optional[SingleRefType] = Field(default=None, alias="SingleRefType")
-    __properties = ["username", "SingleRefType"]
+    __properties: ClassVar[List[str]] = ["username", "SingleRefType"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/animal.py

@@ -28,7 +28,7 @@ class Animal(BaseModel):
     """
     class_name: StrictStr = Field(alias="className")
     color: Optional[StrictStr] = 'red'
-    __properties = ["className", "color"]
+    __properties: ClassVar[List[str]] = ["className", "color"]
 
     model_config = {
         "populate_by_name": True,
@@ -37,20 +37,19 @@ class Animal(BaseModel):
 
 
     # JSON field name that stores the object type
-    __discriminator_property_name = 'className'
+    __discriminator_property_name: ClassVar[List[str]] = 'className'
 
     # discriminator mappings
-    __discriminator_value_class_map = {
-        'Cat': 'Cat',
-        'Dog': 'Dog'
+    __discriminator_value_class_map: ClassVar[Dict[str, str]] = {
+        'Cat': 'Cat','Dog': 'Dog'
     }
 
     @classmethod
     def get_discriminator_value(cls, obj: dict) -> str:
         """Returns the discriminator value (object type) of the data"""
-        discriminator_value = obj[cls.__discriminator_property_name.default]
+        discriminator_value = obj[cls.__discriminator_property_name]
         if discriminator_value:
-            return cls.__discriminator_value_class_map.default.get(discriminator_value)
+            return cls.__discriminator_value_class_map.get(discriminator_value)
         else:
             return None
 
@@ -86,8 +85,8 @@ class Animal(BaseModel):
             return klass.from_dict(obj)
         else:
             raise ValueError("Animal failed to lookup discriminator value from " +
-                             json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name.default +
-                             ", mapping: " + json.dumps(cls.__discriminator_value_class_map.default))
+                             json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
+                             ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
 
 from petstore_api.models.cat import Cat
 from petstore_api.models.dog import Dog

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/api_response.py

@@ -28,7 +28,7 @@ class ApiResponse(BaseModel):
     code: Optional[StrictInt] = None
     type: Optional[StrictStr] = None
     message: Optional[StrictStr] = None
-    __properties = ["code", "type", "message"]
+    __properties: ClassVar[List[str]] = ["code", "type", "message"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_model.py

@@ -27,7 +27,7 @@ class ArrayOfArrayOfModel(BaseModel):
     ArrayOfArrayOfModel
     """
     another_property: Optional[List[List[Tag]]] = None
-    __properties = ["another_property"]
+    __properties: ClassVar[List[str]] = ["another_property"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_array_of_number_only.py

@@ -27,7 +27,7 @@ class ArrayOfArrayOfNumberOnly(BaseModel):
     ArrayOfArrayOfNumberOnly
     """
     array_array_number: Optional[List[List[float]]] = Field(default=None, alias="ArrayArrayNumber")
-    __properties = ["ArrayArrayNumber"]
+    __properties: ClassVar[List[str]] = ["ArrayArrayNumber"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_of_number_only.py

@@ -27,7 +27,7 @@ class ArrayOfNumberOnly(BaseModel):
     ArrayOfNumberOnly
     """
     array_number: Optional[List[float]] = Field(default=None, alias="ArrayNumber")
-    __properties = ["ArrayNumber"]
+    __properties: ClassVar[List[str]] = ["ArrayNumber"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/array_test.py

@@ -31,7 +31,7 @@ class ArrayTest(BaseModel):
     array_of_string: Optional[Annotated[List[StrictStr], Field(min_length=0, max_length=3)]] = None
     array_array_of_integer: Optional[List[List[StrictInt]]] = None
     array_array_of_model: Optional[List[List[ReadOnlyFirst]]] = None
-    __properties = ["array_of_string", "array_array_of_integer", "array_array_of_model"]
+    __properties: ClassVar[List[str]] = ["array_of_string", "array_array_of_integer", "array_array_of_model"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/basque_pig.py

@@ -28,7 +28,7 @@ class BasquePig(BaseModel):
     """
     class_name: StrictStr = Field(alias="className")
     color: StrictStr
-    __properties = ["className", "color"]
+    __properties: ClassVar[List[str]] = ["className", "color"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/capitalization.py

@@ -32,7 +32,7 @@ class Capitalization(BaseModel):
     capital_snake: Optional[StrictStr] = Field(default=None, alias="Capital_Snake")
     sca_eth_flow_points: Optional[StrictStr] = Field(default=None, alias="SCA_ETH_Flow_Points")
     att_name: Optional[StrictStr] = Field(default=None, description="Name of the pet ", alias="ATT_NAME")
-    __properties = ["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME"]
+    __properties: ClassVar[List[str]] = ["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/cat.py

@@ -27,7 +27,7 @@ class Cat(Animal):
     Cat
     """
     declawed: Optional[StrictBool] = None
-    __properties = ["className", "color", "declawed"]
+    __properties: ClassVar[List[str]] = ["className", "color", "declawed"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/category.py

@@ -27,7 +27,7 @@ class Category(BaseModel):
     """
     id: Optional[StrictInt] = None
     name: StrictStr
-    __properties = ["id", "name"]
+    __properties: ClassVar[List[str]] = ["id", "name"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/circular_reference_model.py

@@ -27,7 +27,7 @@ class CircularReferenceModel(BaseModel):
     """
     size: Optional[StrictInt] = None
     nested: Optional[FirstRef] = None
-    __properties = ["size", "nested"]
+    __properties: ClassVar[List[str]] = ["size", "nested"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/class_model.py

@@ -27,7 +27,7 @@ class ClassModel(BaseModel):
     Model for testing model with \"_class\" property  # noqa: E501
     """
     var_class: Optional[StrictStr] = Field(default=None, alias="_class")
-    __properties = ["_class"]
+    __properties: ClassVar[List[str]] = ["_class"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/client.py

@@ -26,7 +26,7 @@ class Client(BaseModel):
     Client
     """
     client: Optional[StrictStr] = None
-    __properties = ["client"]
+    __properties: ClassVar[List[str]] = ["client"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature.py

@@ -28,7 +28,7 @@ class Creature(BaseModel):
     """
     info: CreatureInfo
     type: StrictStr
-    __properties = ["info", "type"]
+    __properties: ClassVar[List[str]] = ["info", "type"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/creature_info.py

@@ -26,7 +26,7 @@ class CreatureInfo(BaseModel):
     CreatureInfo
     """
     name: StrictStr
-    __properties = ["name"]
+    __properties: ClassVar[List[str]] = ["name"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/danish_pig.py

@@ -28,7 +28,7 @@ class DanishPig(BaseModel):
     """
     class_name: StrictStr = Field(alias="className")
     size: StrictInt
-    __properties = ["className", "size"]
+    __properties: ClassVar[List[str]] = ["className", "size"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/deprecated_object.py

@@ -26,7 +26,7 @@ class DeprecatedObject(BaseModel):
     DeprecatedObject
     """
     name: Optional[StrictStr] = None
-    __properties = ["name"]
+    __properties: ClassVar[List[str]] = ["name"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dog.py

@@ -27,7 +27,7 @@ class Dog(Animal):
     Dog
     """
     breed: Optional[StrictStr] = None
-    __properties = ["className", "color", "breed"]
+    __properties: ClassVar[List[str]] = ["className", "color", "breed"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/dummy_model.py

@@ -27,7 +27,7 @@ class DummyModel(BaseModel):
     """
     category: Optional[StrictStr] = None
     self_ref: Optional[SelfReferenceModel] = None
-    __properties = ["category", "self_ref"]
+    __properties: ClassVar[List[str]] = ["category", "self_ref"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_arrays.py

@@ -27,7 +27,7 @@ class EnumArrays(BaseModel):
     """
     just_symbol: Optional[StrictStr] = None
     array_enum: Optional[List[StrictStr]] = None
-    __properties = ["just_symbol", "array_enum"]
+    __properties: ClassVar[List[str]] = ["just_symbol", "array_enum"]
 
     @field_validator('just_symbol')
     def just_symbol_validate_enum(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/enum_test.py

@@ -39,7 +39,7 @@ class EnumTest(BaseModel):
     outer_enum_integer: Optional[OuterEnumInteger] = Field(default=None, alias="outerEnumInteger")
     outer_enum_default_value: Optional[OuterEnumDefaultValue] = Field(default=None, alias="outerEnumDefaultValue")
     outer_enum_integer_default_value: Optional[OuterEnumIntegerDefaultValue] = Field(default=None, alias="outerEnumIntegerDefaultValue")
-    __properties = ["enum_string", "enum_string_required", "enum_integer_default", "enum_integer", "enum_number", "outerEnum", "outerEnumInteger", "outerEnumDefaultValue", "outerEnumIntegerDefaultValue"]
+    __properties: ClassVar[List[str]] = ["enum_string", "enum_string_required", "enum_integer_default", "enum_integer", "enum_number", "outerEnum", "outerEnumInteger", "outerEnumDefaultValue", "outerEnumIntegerDefaultValue"]
 
     @field_validator('enum_string')
     def enum_string_validate_enum(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file.py

@@ -27,7 +27,7 @@ class File(BaseModel):
     Must be named `File` for test.  # noqa: E501
     """
     source_uri: Optional[StrictStr] = Field(default=None, description="Test capitalization", alias="sourceURI")
-    __properties = ["sourceURI"]
+    __properties: ClassVar[List[str]] = ["sourceURI"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/file_schema_test_class.py

@@ -28,7 +28,7 @@ class FileSchemaTestClass(BaseModel):
     """
     file: Optional[File] = None
     files: Optional[List[File]] = None
-    __properties = ["file", "files"]
+    __properties: ClassVar[List[str]] = ["file", "files"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/first_ref.py

@@ -27,7 +27,7 @@ class FirstRef(BaseModel):
     """
     category: Optional[StrictStr] = None
     self_ref: Optional[SecondRef] = None
-    __properties = ["category", "self_ref"]
+    __properties: ClassVar[List[str]] = ["category", "self_ref"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo.py

@@ -26,7 +26,7 @@ class Foo(BaseModel):
     Foo
     """
     bar: Optional[StrictStr] = 'bar'
-    __properties = ["bar"]
+    __properties: ClassVar[List[str]] = ["bar"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/foo_get_default_response.py

@@ -27,7 +27,7 @@ class FooGetDefaultResponse(BaseModel):
     FooGetDefaultResponse
     """
     string: Optional[Foo] = None
-    __properties = ["string"]
+    __properties: ClassVar[List[str]] = ["string"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/format_test.py

@@ -44,7 +44,7 @@ class FormatTest(BaseModel):
     password: Annotated[str, Field(min_length=10, strict=True, max_length=64)]
     pattern_with_digits: Optional[Annotated[str, Field(strict=True)]] = Field(default=None, description="A string that is a 10 digit number. Can have leading zeros.")
     pattern_with_digits_and_delimiter: Optional[Annotated[str, Field(strict=True)]] = Field(default=None, description="A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.")
-    __properties = ["integer", "int32", "int64", "number", "double", "decimal", "string", "string_with_double_quote_pattern", "byte", "binary", "date", "dateTime", "uuid", "password", "pattern_with_digits", "pattern_with_digits_and_delimiter"]
+    __properties: ClassVar[List[str]] = ["integer", "int32", "int64", "number", "double", "decimal", "string", "string_with_double_quote_pattern", "byte", "binary", "date", "dateTime", "uuid", "password", "pattern_with_digits", "pattern_with_digits_and_delimiter"]
 
     @field_validator('string')
     def string_validate_regular_expression(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/has_only_read_only.py

@@ -27,7 +27,7 @@ class HasOnlyReadOnly(BaseModel):
     """
     bar: Optional[StrictStr] = None
     foo: Optional[StrictStr] = None
-    __properties = ["bar", "foo"]
+    __properties: ClassVar[List[str]] = ["bar", "foo"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/health_check_result.py

@@ -27,7 +27,7 @@ class HealthCheckResult(BaseModel):
     Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.  # noqa: E501
     """
     nullable_message: Optional[StrictStr] = Field(default=None, alias="NullableMessage")
-    __properties = ["NullableMessage"]
+    __properties: ClassVar[List[str]] = ["NullableMessage"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/inner_dict_with_property.py

@@ -27,7 +27,7 @@ class InnerDictWithProperty(BaseModel):
     InnerDictWithProperty
     """
     a_property: Optional[Union[str, Any]] = Field(default=None, alias="aProperty")
-    __properties = ["aProperty"]
+    __properties: ClassVar[List[str]] = ["aProperty"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/list_class.py

@@ -0,0 +1,74 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+from typing import Optional
+from pydantic import BaseModel, StrictStr
+from pydantic import Field
+
+class ListClass(BaseModel):
+    """
+    ListClass
+    """
+    var_123_list: Optional[StrictStr] = Field(default=None, alias="123-list")
+    __properties: ClassVar[List[str]] = ["123-list"]
+
+    model_config = {
+        "populate_by_name": True,
+        "validate_assignment": True
+    }
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> ListClass:
+        """Create an instance of ListClass from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.model_dump(by_alias=True,
+                          exclude={
+                          },
+                          exclude_none=True)
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> ListClass:
+        """Create an instance of ListClass from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return ListClass.model_validate(obj)
+
+        _obj = ListClass.model_validate({
+            "123-list": obj.get("123-list")
+        })
+        return _obj
+
+

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_of_array_of_model.py

@@ -28,7 +28,7 @@ class MapOfArrayOfModel(BaseModel):
     MapOfArrayOfModel
     """
     shop_id_to_org_online_lip_map: Optional[Dict[str, List[Tag]]] = Field(default=None, alias="shopIdToOrgOnlineLipMap")
-    __properties = ["shopIdToOrgOnlineLipMap"]
+    __properties: ClassVar[List[str]] = ["shopIdToOrgOnlineLipMap"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py

@@ -29,7 +29,7 @@ class MapTest(BaseModel):
     map_of_enum_string: Optional[Dict[str, StrictStr]] = None
     direct_map: Optional[Dict[str, StrictBool]] = None
     indirect_map: Optional[Dict[str, StrictBool]] = None
-    __properties = ["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map"]
+    __properties: ClassVar[List[str]] = ["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map"]
 
     @field_validator('map_of_enum_string')
     def map_of_enum_string_validate_enum(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/mixed_properties_and_additional_properties_class.py

@@ -30,7 +30,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(BaseModel):
     uuid: Optional[StrictStr] = None
     date_time: Optional[datetime] = Field(default=None, alias="dateTime")
     map: Optional[Dict[str, Animal]] = None
-    __properties = ["uuid", "dateTime", "map"]
+    __properties: ClassVar[List[str]] = ["uuid", "dateTime", "map"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model200_response.py

@@ -28,7 +28,7 @@ class Model200Response(BaseModel):
     """
     name: Optional[StrictInt] = None
     var_class: Optional[StrictStr] = Field(default=None, alias="class")
-    __properties = ["name", "class"]
+    __properties: ClassVar[List[str]] = ["name", "class"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/model_return.py

@@ -27,7 +27,7 @@ class ModelReturn(BaseModel):
     Model for testing reserved words  # noqa: E501
     """
     var_return: Optional[StrictInt] = Field(default=None, alias="return")
-    __properties = ["return"]
+    __properties: ClassVar[List[str]] = ["return"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/name.py

@@ -30,7 +30,7 @@ class Name(BaseModel):
     snake_case: Optional[StrictInt] = None
     var_property: Optional[StrictStr] = Field(default=None, alias="property")
     var_123_number: Optional[StrictInt] = Field(default=None, alias="123Number")
-    __properties = ["name", "snake_case", "property", "123Number"]
+    __properties: ClassVar[List[str]] = ["name", "snake_case", "property", "123Number"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_class.py

@@ -39,7 +39,7 @@ class NullableClass(BaseModel):
     object_and_items_nullable_prop: Optional[Dict[str, Union[str, Any]]] = None
     object_items_nullable: Optional[Dict[str, Union[str, Any]]] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["required_integer_prop", "integer_prop", "number_prop", "boolean_prop", "string_prop", "date_prop", "datetime_prop", "array_nullable_prop", "array_and_items_nullable_prop", "array_items_nullable", "object_nullable_prop", "object_and_items_nullable_prop", "object_items_nullable"]
+    __properties: ClassVar[List[str]] = ["required_integer_prop", "integer_prop", "number_prop", "boolean_prop", "string_prop", "date_prop", "datetime_prop", "array_nullable_prop", "array_and_items_nullable_prop", "array_items_nullable", "object_nullable_prop", "object_and_items_nullable_prop", "object_items_nullable"]
 
     model_config = {
         "populate_by_name": True,
@@ -156,7 +156,7 @@ class NullableClass(BaseModel):
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
-            if _key not in cls.__properties.default:
+            if _key not in cls.__properties:
                 _obj.additional_properties[_key] = obj.get(_key)
 
         return _obj

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/nullable_property.py

@@ -29,7 +29,7 @@ class NullableProperty(BaseModel):
     """
     id: StrictInt
     name: Optional[Annotated[str, Field(strict=True)]]
-    __properties = ["id", "name"]
+    __properties: ClassVar[List[str]] = ["id", "name"]
 
     @field_validator('name')
     def name_validate_regular_expression(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/number_only.py

@@ -27,7 +27,7 @@ class NumberOnly(BaseModel):
     NumberOnly
     """
     just_number: Optional[float] = Field(default=None, alias="JustNumber")
-    __properties = ["JustNumber"]
+    __properties: ClassVar[List[str]] = ["JustNumber"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_to_test_additional_properties.py

@@ -27,7 +27,7 @@ class ObjectToTestAdditionalProperties(BaseModel):
     Minimal object  # noqa: E501
     """
     var_property: Optional[StrictBool] = Field(default=False, description="Property", alias="property")
-    __properties = ["property"]
+    __properties: ClassVar[List[str]] = ["property"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/object_with_deprecated_fields.py

@@ -31,7 +31,7 @@ class ObjectWithDeprecatedFields(BaseModel):
     id: Optional[float] = None
     deprecated_ref: Optional[DeprecatedObject] = Field(default=None, alias="deprecatedRef")
     bars: Optional[List[StrictStr]] = None
-    __properties = ["uuid", "id", "deprecatedRef", "bars"]
+    __properties: ClassVar[List[str]] = ["uuid", "id", "deprecatedRef", "bars"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/order.py

@@ -32,7 +32,7 @@ class Order(BaseModel):
     ship_date: Optional[datetime] = Field(default=None, alias="shipDate")
     status: Optional[StrictStr] = Field(default=None, description="Order Status")
     complete: Optional[StrictBool] = False
-    __properties = ["id", "petId", "quantity", "shipDate", "status", "complete"]
+    __properties: ClassVar[List[str]] = ["id", "petId", "quantity", "shipDate", "status", "complete"]
 
     @field_validator('status')
     def status_validate_enum(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_composite.py

@@ -28,7 +28,7 @@ class OuterComposite(BaseModel):
     my_number: Optional[float] = None
     my_string: Optional[StrictStr] = None
     my_boolean: Optional[StrictBool] = None
-    __properties = ["my_number", "my_string", "my_boolean"]
+    __properties: ClassVar[List[str]] = ["my_number", "my_string", "my_boolean"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/outer_object_with_enum_property.py

@@ -29,7 +29,7 @@ class OuterObjectWithEnumProperty(BaseModel):
     """
     str_value: Optional[OuterEnum] = None
     value: OuterEnumInteger
-    __properties = ["str_value", "value"]
+    __properties: ClassVar[List[str]] = ["str_value", "value"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent.py

@@ -28,7 +28,7 @@ class Parent(BaseModel):
     Parent
     """
     optional_dict: Optional[Dict[str, InnerDictWithProperty]] = Field(default=None, alias="optionalDict")
-    __properties = ["optionalDict"]
+    __properties: ClassVar[List[str]] = ["optionalDict"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/parent_with_optional_dict.py

@@ -28,7 +28,7 @@ class ParentWithOptionalDict(BaseModel):
     ParentWithOptionalDict
     """
     optional_dict: Optional[Dict[str, InnerDictWithProperty]] = Field(default=None, alias="optionalDict")
-    __properties = ["optionalDict"]
+    __properties: ClassVar[List[str]] = ["optionalDict"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/pet.py

@@ -35,7 +35,7 @@ class Pet(BaseModel):
     photo_urls: Annotated[List[StrictStr], Field(min_length=0)] = Field(alias="photoUrls")
     tags: Optional[List[Tag]] = None
     status: Optional[StrictStr] = Field(default=None, description="pet status in the store")
-    __properties = ["id", "category", "name", "photoUrls", "tags", "status"]
+    __properties: ClassVar[List[str]] = ["id", "category", "name", "photoUrls", "tags", "status"]
 
     @field_validator('status')
     def status_validate_enum(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/property_name_collision.py

@@ -29,7 +29,7 @@ class PropertyNameCollision(BaseModel):
     type: Optional[StrictStr] = Field(default=None, alias="_type")
     type: Optional[StrictStr] = None
     type_: Optional[StrictStr] = None
-    __properties = ["_type", "type", "type_"]
+    __properties: ClassVar[List[str]] = ["_type", "type", "type_"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/read_only_first.py

@@ -27,7 +27,7 @@ class ReadOnlyFirst(BaseModel):
     """
     bar: Optional[StrictStr] = None
     baz: Optional[StrictStr] = None
-    __properties = ["bar", "baz"]
+    __properties: ClassVar[List[str]] = ["bar", "baz"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/second_ref.py

@@ -27,7 +27,7 @@ class SecondRef(BaseModel):
     """
     category: Optional[StrictStr] = None
     circular_ref: Optional[CircularReferenceModel] = None
-    __properties = ["category", "circular_ref"]
+    __properties: ClassVar[List[str]] = ["category", "circular_ref"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/self_reference_model.py

@@ -27,7 +27,7 @@ class SelfReferenceModel(BaseModel):
     """
     size: Optional[StrictInt] = None
     nested: Optional[DummyModel] = None
-    __properties = ["size", "nested"]
+    __properties: ClassVar[List[str]] = ["size", "nested"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_model_name.py

@@ -27,7 +27,7 @@ class SpecialModelName(BaseModel):
     SpecialModelName
     """
     special_property_name: Optional[StrictInt] = Field(default=None, alias="$special[property.name]")
-    __properties = ["$special[property.name]"]
+    __properties: ClassVar[List[str]] = ["$special[property.name]"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/special_name.py

@@ -30,7 +30,7 @@ class SpecialName(BaseModel):
     var_property: Optional[StrictInt] = Field(default=None, alias="property")
     var_async: Optional[Category] = Field(default=None, alias="async")
     var_schema: Optional[StrictStr] = Field(default=None, description="pet status in the store", alias="schema")
-    __properties = ["property", "async", "schema"]
+    __properties: ClassVar[List[str]] = ["property", "async", "schema"]
 
     @field_validator('var_schema')
     def var_schema_validate_enum(cls, value):

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tag.py

@@ -27,7 +27,7 @@ class Tag(BaseModel):
     """
     id: Optional[StrictInt] = None
     name: Optional[StrictStr] = None
-    __properties = ["id", "name"]
+    __properties: ClassVar[List[str]] = ["id", "name"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/test_inline_freeform_additional_properties_request.py

@@ -28,7 +28,7 @@ class TestInlineFreeformAdditionalPropertiesRequest(BaseModel):
     """
     some_property: Optional[StrictStr] = Field(default=None, alias="someProperty")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["someProperty"]
+    __properties: ClassVar[List[str]] = ["someProperty"]
 
     model_config = {
         "populate_by_name": True,
@@ -78,7 +78,7 @@ class TestInlineFreeformAdditionalPropertiesRequest(BaseModel):
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
-            if _key not in cls.__properties.default:
+            if _key not in cls.__properties:
                 _obj.additional_properties[_key] = obj.get(_key)
 
         return _obj

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/tiger.py

@@ -26,7 +26,7 @@ class Tiger(BaseModel):
     Tiger
     """
     skill: Optional[StrictStr] = None
-    __properties = ["skill"]
+    __properties: ClassVar[List[str]] = ["skill"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/user.py

@@ -34,7 +34,7 @@ class User(BaseModel):
     password: Optional[StrictStr] = None
     phone: Optional[StrictStr] = None
     user_status: Optional[StrictInt] = Field(default=None, description="User Status", alias="userStatus")
-    __properties = ["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus"]
+    __properties: ClassVar[List[str]] = ["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/with_nested_one_of.py

@@ -30,7 +30,7 @@ class WithNestedOneOf(BaseModel):
     size: Optional[StrictInt] = None
     nested_pig: Optional[Pig] = None
     nested_oneof_enum_string: Optional[OneOfEnumString] = None
-    __properties = ["size", "nested_pig", "nested_oneof_enum_string"]
+    __properties: ClassVar[List[str]] = ["size", "nested_pig", "nested_oneof_enum_string"]
 
     model_config = {
         "populate_by_name": True,

samples/openapi3/client/petstore/python-aiohttp/test/test_list_class.py

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+import datetime
+
+from petstore_api.models.list_class import ListClass  # noqa: E501
+
+class TestListClass(unittest.TestCase):
+    """ListClass unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> ListClass:
+        """Test ListClass
+            include_option is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `ListClass`
+        """
+        model = ListClass()  # noqa: E501
+        if include_optional:
+            return ListClass(
+                var_123_list = ''
+            )
+        else:
+            return ListClass(
+        )
+        """
+
+    def testListClass(self):
+        """Test ListClass"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES

@@ -49,7 +49,7 @@ docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
 docs/InnerDictWithProperty.md
 docs/IntOrString.md
-docs/List.md
+docs/ListClass.md
 docs/MapOfArrayOfModel.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -146,7 +146,7 @@ petstore_api/models/has_only_read_only.py
 petstore_api/models/health_check_result.py
 petstore_api/models/inner_dict_with_property.py
 petstore_api/models/int_or_string.py
-petstore_api/models/list.py
+petstore_api/models/list_class.py
 petstore_api/models/map_of_array_of_model.py
 petstore_api/models/map_test.py
 petstore_api/models/mixed_properties_and_additional_properties_class.py

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md

@@ -177,7 +177,7 @@ Class | Method | HTTP request | Description
  - [HealthCheckResult](docs/HealthCheckResult.md)
  - [InnerDictWithProperty](docs/InnerDictWithProperty.md)
  - [IntOrString](docs/IntOrString.md)
- - [List](docs/List.md)
+ - [ListClass](docs/ListClass.md)
  - [MapOfArrayOfModel](docs/MapOfArrayOfModel.md)
  - [MapTest](docs/MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/ListClass.md

@@ -0,0 +1,28 @@
+# ListClass
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**var_123_list** | **str** |  | [optional] 
+
+## Example
+
+```python
+from petstore_api.models.list_class import ListClass
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ListClass from a JSON string
+list_class_instance = ListClass.from_json(json)
+# print the JSON string representation of the object
+print ListClass.to_json()
+
+# convert the object into a dict
+list_class_dict = list_class_instance.to_dict()
+# create an instance of ListClass from a dict
+list_class_form_dict = list_class.from_dict(list_class_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py

@@ -80,7 +80,7 @@ from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 from petstore_api.models.int_or_string import IntOrString
-from petstore_api.models.list import List
+from petstore_api.models.list_class import ListClass
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel
 from petstore_api.models.map_test import MapTest
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py

@@ -56,7 +56,7 @@ from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 from petstore_api.models.int_or_string import IntOrString
-from petstore_api.models.list import List
+from petstore_api.models.list_class import ListClass
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel
 from petstore_api.models.map_test import MapTest
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/list_class.py

@@ -0,0 +1,71 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+from typing import Optional
+from pydantic import BaseModel, Field, StrictStr
+
+class ListClass(BaseModel):
+    """
+    ListClass
+    """
+    var_123_list: Optional[StrictStr] = Field(None, alias="123-list")
+    __properties = ["123-list"]
+
+    class Config:
+        """Pydantic configuration"""
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> ListClass:
+        """Create an instance of ListClass from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True,
+                          exclude={
+                          },
+                          exclude_none=True)
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> ListClass:
+        """Create an instance of ListClass from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return ListClass.parse_obj(obj)
+
+        _obj = ListClass.parse_obj({
+            "var_123_list": obj.get("123-list")
+        })
+        return _obj
+
+

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/test/test_list_class.py

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+import datetime
+
+from petstore_api.models.list_class import ListClass  # noqa: E501
+
+class TestListClass(unittest.TestCase):
+    """ListClass unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> ListClass:
+        """Test ListClass
+            include_option is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `ListClass`
+        """
+        model = ListClass()  # noqa: E501
+        if include_optional:
+            return ListClass(
+                var_123_list = ''
+            )
+        else:
+            return ListClass(
+        )
+        """
+
+    def testListClass(self):
+        """Test ListClass"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/tests/test_model.py

@@ -173,7 +173,7 @@ class ModelTests(unittest.TestCase):
     def test_list(self):
         # should throw exception as var_123_list should be string
         try:
-            l3 = petstore_api.List(var_123_list=123)
+            l3 = petstore_api.ListClass(var_123_list=123)
             self.assertTrue(False)  # this line shouldn't execute
         except ValueError as e:
             #error_message = (
@@ -182,13 +182,13 @@ class ModelTests(unittest.TestCase):
             #    "  str type expected (type=type_error.str)\n")
             self.assertTrue("str type expected" in str(e))
 
-        l = petstore_api.List(var_123_list="bulldog")
+        l = petstore_api.ListClass(var_123_list="bulldog")
         self.assertEqual(l.to_json(), '{"123-list": "bulldog"}')
         self.assertEqual(l.to_dict(), {'123-list': 'bulldog'})
-        l2 = petstore_api.List.from_json(l.to_json())
+        l2 = petstore_api.ListClass.from_json(l.to_json())
         self.assertEqual(l2.var_123_list, 'bulldog')
 
-        self.assertTrue(isinstance(l2, petstore_api.List))
+        self.assertTrue(isinstance(l2, petstore_api.ListClass))
 
     def test_enum_ref_property(self):
         # test enum ref property

samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES

@@ -49,7 +49,7 @@ docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
 docs/InnerDictWithProperty.md
 docs/IntOrString.md
-docs/List.md
+docs/ListClass.md
 docs/MapOfArrayOfModel.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -146,7 +146,7 @@ petstore_api/models/has_only_read_only.py
 petstore_api/models/health_check_result.py
 petstore_api/models/inner_dict_with_property.py
 petstore_api/models/int_or_string.py
-petstore_api/models/list.py
+petstore_api/models/list_class.py
 petstore_api/models/map_of_array_of_model.py
 petstore_api/models/map_test.py
 petstore_api/models/mixed_properties_and_additional_properties_class.py

samples/openapi3/client/petstore/python-pydantic-v1/README.md

@@ -177,7 +177,7 @@ Class | Method | HTTP request | Description
  - [HealthCheckResult](docs/HealthCheckResult.md)
  - [InnerDictWithProperty](docs/InnerDictWithProperty.md)
  - [IntOrString](docs/IntOrString.md)
- - [List](docs/List.md)
+ - [ListClass](docs/ListClass.md)
  - [MapOfArrayOfModel](docs/MapOfArrayOfModel.md)
  - [MapTest](docs/MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)

samples/openapi3/client/petstore/python-pydantic-v1/docs/ListClass.md

@@ -0,0 +1,28 @@
+# ListClass
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**var_123_list** | **str** |  | [optional] 
+
+## Example
+
+```python
+from petstore_api.models.list_class import ListClass
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of ListClass from a JSON string
+list_class_instance = ListClass.from_json(json)
+# print the JSON string representation of the object
+print ListClass.to_json()
+
+# convert the object into a dict
+list_class_dict = list_class_instance.to_dict()
+# create an instance of ListClass from a dict
+list_class_form_dict = list_class.from_dict(list_class_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py

@@ -80,7 +80,7 @@ from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 from petstore_api.models.int_or_string import IntOrString
-from petstore_api.models.list import List
+from petstore_api.models.list_class import ListClass
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel
 from petstore_api.models.map_test import MapTest
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py

@@ -56,7 +56,7 @@ from petstore_api.models.has_only_read_only import HasOnlyReadOnly
 from petstore_api.models.health_check_result import HealthCheckResult
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 from petstore_api.models.int_or_string import IntOrString
-from petstore_api.models.list import List
+from petstore_api.models.list_class import ListClass
 from petstore_api.models.map_of_array_of_model import MapOfArrayOfModel
 from petstore_api.models.map_test import MapTest
 from petstore_api.models.mixed_properties_and_additional_properties_class import MixedPropertiesAndAdditionalPropertiesClass

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/list_class.py

@@ -0,0 +1,83 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+from typing import Any, Dict, Optional
+from pydantic import BaseModel, Field, StrictStr
+
+class ListClass(BaseModel):
+    """
+    ListClass
+    """
+    var_123_list: Optional[StrictStr] = Field(None, alias="123-list")
+    additional_properties: Dict[str, Any] = {}
+    __properties = ["123-list"]
+
+    class Config:
+        """Pydantic configuration"""
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> ListClass:
+        """Create an instance of ListClass from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True,
+                          exclude={
+                            "additional_properties"
+                          },
+                          exclude_none=True)
+        # puts key-value pairs in additional_properties in the top level
+        if self.additional_properties is not None:
+            for _key, _value in self.additional_properties.items():
+                _dict[_key] = _value
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> ListClass:
+        """Create an instance of ListClass from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return ListClass.parse_obj(obj)
+
+        _obj = ListClass.parse_obj({
+            "var_123_list": obj.get("123-list")
+        })
+        # store additional fields in additional_properties
+        for _key in obj.keys():
+            if _key not in cls.__properties:
+                _obj.additional_properties[_key] = obj.get(_key)
+
+        return _obj
+
+

samples/openapi3/client/petstore/python-pydantic-v1/test/test_list_class.py

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+import unittest
+import datetime
+
+from petstore_api.models.list_class import ListClass  # noqa: E501
+
+class TestListClass(unittest.TestCase):
+    """ListClass unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional) -> ListClass:
+        """Test ListClass
+            include_option is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # uncomment below to create an instance of `ListClass`
+        """
+        model = ListClass()  # noqa: E501
+        if include_optional:
+            return ListClass(
+                var_123_list = ''
+            )
+        else:
+            return ListClass(
+        )
+        """
+
+    def testListClass(self):
+        """Test ListClass"""
+        # inst_req_only = self.make_instance(include_optional=False)
+        # inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python-pydantic-v1/tests/test_model.py

@@ -316,7 +316,7 @@ class ModelTests(unittest.TestCase):
     def test_list(self):
         # should throw exception as var_123_list should be string
         try:
-            l3 = petstore_api.List(var_123_list=123)
+            l3 = petstore_api.ListClass(var_123_list=123)
             self.assertTrue(False)  # this line shouldn't execute
         except ValueError as e:
             #error_message = (
@@ -325,13 +325,13 @@ class ModelTests(unittest.TestCase):
             #    "  str type expected (type=type_error.str)\n")
             self.assertTrue("str type expected" in str(e))
 
-        l = petstore_api.List(var_123_list="bulldog")
+        l = petstore_api.ListClass(var_123_list="bulldog")
         self.assertEqual(l.to_json(), '{"123-list": "bulldog"}')
         self.assertEqual(l.to_dict(), {'123-list': 'bulldog'})
-        l2 = petstore_api.List.from_json(l.to_json())
+        l2 = petstore_api.ListClass.from_json(l.to_json())
         self.assertEqual(l2.var_123_list, 'bulldog')
 
-        self.assertTrue(isinstance(l2, petstore_api.List))
+        self.assertTrue(isinstance(l2, petstore_api.ListClass))
 
     def test_enum_ref_property(self):
         # test enum ref property

samples/openapi3/client/petstore/python/.openapi-generator/FILES

@@ -49,7 +49,7 @@ docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
 docs/InnerDictWithProperty.md
 docs/IntOrString.md
-docs/List.md
+docs/ListClass.md
 docs/MapOfArrayOfModel.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -146,7 +146,7 @@ petstore_api/models/has_only_read_only.py
 petstore_api/models/health_check_result.py
 petstore_api/models/inner_dict_with_property.py
 petstore_api/models/int_or_string.py
-petstore_api/models/list.py
+petstore_api/models/list_class.py
 petstore_api/models/map_of_array_of_model.py
 petstore_api/models/map_test.py
 petstore_api/models/mixed_properties_and_additional_properties_class.py