python-pydantic-v1: Keep trailing commas for enum validation tuples (OpenAPITools#19985)

* python-pydantic-v1: Keep trailing commas for tuples when enum has just single member

* Update samples

* Add test for single member enums

* Refactor test name

Author: chiragjn

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

@@ -69,11 +69,11 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         {{/required}}
         {{#isArray}}
         for i in value:
-            if i not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}):
+            if i not in ({{#allowableValues}}{{#enumVars}}{{{value}}},{{^-last}} {{/-last}}{{/enumVars}}{{/allowableValues}}):
                 raise ValueError("each list item must be one of ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
         {{/isArray}}
         {{^isArray}}
-        if value not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}):
+        if value not in ({{#allowableValues}}{{#enumVars}}{{{value}}},{{^-last}} {{/-last}}{{/enumVars}}{{/allowableValues}}):
             raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
         {{/isArray}}
         return value

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

@@ -74,11 +74,11 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         {{/required}}
         {{#isArray}}
         for i in value:
-            if i not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}):
+            if i not in ({{#allowableValues}}{{#enumVars}}{{{value}}},{{^-last}} {{/-last}}{{/enumVars}}{{/allowableValues}}):
                 raise ValueError("each list item must be one of ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
         {{/isArray}}
         {{^isArray}}
-        if value not in ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}):
+        if value not in ({{#allowableValues}}{{#enumVars}}{{{value}}},{{^-last}} {{/-last}}{{/enumVars}}{{/allowableValues}}):
             raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
         {{/isArray}}
         return value

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

@@ -2124,6 +2124,15 @@ components:
             - FOOVar
             - BarVar
             - bazVar
+        enum_string_single_member:
+          type: string
+          enum:
+            - 'abc'
+        enum_integer_single_member:
+          type: integer
+          format: int32
+          enum:
+            - 100
         outerEnum:
           $ref: '#/components/schemas/OuterEnum'
         outerEnumInteger:

samples/client/echo_api/python-pydantic-v1/openapi_client/models/default_value.py

@@ -44,7 +44,7 @@ def array_string_enum_default_validate_enum(cls, value):
             return value
 
         for i in value:
-            if i not in ('success', 'failure', 'unclassified'):
+            if i not in ('success', 'failure', 'unclassified',):
                 raise ValueError("each list item must be one of ('success', 'failure', 'unclassified')")
         return value
 

samples/client/echo_api/python-pydantic-v1/openapi_client/models/pet.py

@@ -42,7 +42,7 @@ def status_validate_enum(cls, value):
         if value is None:
             return value
 
-        if value not in ('available', 'pending', 'sold'):
+        if value not in ('available', 'pending', 'sold',):
             raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
         return value
 

samples/client/echo_api/python-pydantic-v1/openapi_client/models/query.py

@@ -37,7 +37,7 @@ def outcomes_validate_enum(cls, value):
             return value
 
         for i in value:
-            if i not in ('SUCCESS', 'FAILURE', 'SKIPPED'):
+            if i not in ('SUCCESS', 'FAILURE', 'SKIPPED',):
                 raise ValueError("each list item must be one of ('SUCCESS', 'FAILURE', 'SKIPPED')")
         return value
 

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

@@ -12,6 +12,8 @@ Name | Type | Description | Notes
 **enum_number** | **float** |  | [optional] 
 **enum_number_vendor_ext** | **int** |  | [optional] 
 **enum_string_vendor_ext** | **str** |  | [optional] 
+**enum_string_single_member** | **str** |  | [optional] 
+**enum_integer_single_member** | **int** |  | [optional] 
 **outer_enum** | [**OuterEnum**](OuterEnum.md) |  | [optional] 
 **outer_enum_integer** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | [optional] 
 **outer_enum_default_value** | [**OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  | [optional] [default to OuterEnumDefaultValue.PLACED]

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

@@ -37,11 +37,13 @@ class EnumTest(BaseModel):
     enum_number: Optional[float] = None
     enum_number_vendor_ext: Optional[StrictInt] = None
     enum_string_vendor_ext: Optional[StrictStr] = None
+    enum_string_single_member: Optional[StrictStr] = None
+    enum_integer_single_member: Optional[StrictInt] = None
     outer_enum: Optional[OuterEnum] = Field(default=None, alias="outerEnum")
     outer_enum_integer: Optional[OuterEnumInteger] = Field(default=None, alias="outerEnumInteger")
     outer_enum_default_value: Optional[OuterEnumDefaultValue] = Field(default=OuterEnumDefaultValue.PLACED, alias="outerEnumDefaultValue")
     outer_enum_integer_default_value: Optional[OuterEnumIntegerDefaultValue] = Field(default=OuterEnumIntegerDefaultValue.NUMBER_0, alias="outerEnumIntegerDefaultValue")
-    __properties: ClassVar[List[str]] = ["enum_string", "enum_string_required", "enum_integer_default", "enum_integer", "enum_number", "enum_number_vendor_ext", "enum_string_vendor_ext", "outerEnum", "outerEnumInteger", "outerEnumDefaultValue", "outerEnumIntegerDefaultValue"]
+    __properties: ClassVar[List[str]] = ["enum_string", "enum_string_required", "enum_integer_default", "enum_integer", "enum_number", "enum_number_vendor_ext", "enum_string_vendor_ext", "enum_string_single_member", "enum_integer_single_member", "outerEnum", "outerEnumInteger", "outerEnumDefaultValue", "outerEnumIntegerDefaultValue"]
 
     @field_validator('enum_string')
     def enum_string_validate_enum(cls, value):
@@ -110,6 +112,26 @@ def enum_string_vendor_ext_validate_enum(cls, value):
             raise ValueError("must be one of enum values ('FOO', 'Bar', 'baz')")
         return value
 
+    @field_validator('enum_string_single_member')
+    def enum_string_single_member_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['abc']):
+            raise ValueError("must be one of enum values ('abc')")
+        return value
+
+    @field_validator('enum_integer_single_member')
+    def enum_integer_single_member_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set([100]):
+            raise ValueError("must be one of enum values (100)")
+        return value
+
     model_config = ConfigDict(
         populate_by_name=True,
         validate_assignment=True,
@@ -173,6 +195,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "enum_number": obj.get("enum_number"),
             "enum_number_vendor_ext": obj.get("enum_number_vendor_ext"),
             "enum_string_vendor_ext": obj.get("enum_string_vendor_ext"),
+            "enum_string_single_member": obj.get("enum_string_single_member"),
+            "enum_integer_single_member": obj.get("enum_integer_single_member"),
             "outerEnum": obj.get("outerEnum"),
             "outerEnumInteger": obj.get("outerEnumInteger"),
             "outerEnumDefaultValue": obj.get("outerEnumDefaultValue") if obj.get("outerEnumDefaultValue") is not None else OuterEnumDefaultValue.PLACED,

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

@@ -11,6 +11,8 @@ Name | Type | Description | Notes
 **enum_number** | **float** |  | [optional] 
 **enum_number_vendor_ext** | **int** |  | [optional] 
 **enum_string_vendor_ext** | **str** |  | [optional] 
+**enum_string_single_member** | **str** |  | [optional] 
+**enum_integer_single_member** | **int** |  | [optional] 
 **outer_enum** | [**OuterEnum**](OuterEnum.md) |  | [optional] 
 **outer_enum_integer** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | [optional] 
 **outer_enum_default_value** | [**OuterEnumDefaultValue**](OuterEnumDefaultValue.md) |  | [optional] 

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

@@ -33,14 +33,14 @@ class Bathing(BaseModel):
     @validator('task_name')
     def task_name_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ('cleaning_deep'):
+        if value not in ('cleaning_deep',):
             raise ValueError("must be one of enum values ('cleaning_deep')")
         return value
 
     @validator('function_name')
     def function_name_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ('care_nourish'):
+        if value not in ('care_nourish',):
             raise ValueError("must be one of enum values ('care_nourish')")
         return value