Merge branch 'fix-map-enums' of https://github.com/vcutrona/openapi-g…

…enerator into vcutrona-fix-map-enums
OpenAPITools · Oct 10, 2024 · 9334b34 · 9334b34
2 parents 30e6612 + 1c32109
commit 9334b34
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/modules/openapi-generator/src/main/resources/python/model_generic.mustache b/modules/openapi-generator/src/main/resources/python/model_generic.mustache
@@ -73,15 +73,22 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
 
         {{/isNullable}}
         {{/required}}
+        {{#isContainer}}
         {{#isArray}}
         for i in value:
             if i not in set([{{#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}}
+        {{#isMap}}
+        for i in value.values():
+            if i not in set([{{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
+                raise ValueError("dict values must be one of enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
+        {{/isMap}}
+        {{/isContainer}}
+        {{^isContainer}}
         if value not in set([{{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}}]):
             raise ValueError("must be one of enum values ({{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}}, {{/-last}}{{/enumVars}}{{/allowableValues}})")
-        {{/isArray}}
+        {{/isContainer}}
         return value
     {{/isEnum}}
 {{/vars}}

diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_test.py
@@ -38,8 +38,9 @@ def map_of_enum_string_validate_enum(cls, value):
         if value is None:
             return value
 
-        if value not in set(['UPPER', 'lower']):
-            raise ValueError("must be one of enum values ('UPPER', 'lower')")
+        for i in value.values():
+            if i not in set(['UPPER', 'lower']):
+                raise ValueError("dict values must be one of enum values ('UPPER', 'lower')")
         return value
 
     model_config = ConfigDict(

diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py
@@ -39,8 +39,9 @@ def map_of_enum_string_validate_enum(cls, value):
         if value is None:
             return value
 
-        if value not in set(['UPPER', 'lower']):
-            raise ValueError("must be one of enum values ('UPPER', 'lower')")
+        for i in value.values():
+            if i not in set(['UPPER', 'lower']):
+                raise ValueError("dict values must be one of enum values ('UPPER', 'lower')")
         return value
 
     model_config = ConfigDict(