[python-experimental] move validations into cls

Created by: spacether

[python-experimental] move validations into cls I am doing this because there are many types of validations and I want them all to be accessible at the same place This paves the way to moving this data into SomeClass.MetaOapg like django does here to prevent collisions with property names

Todo In the future move composed schema definitions into the cls level also

PR checklist

• Read the contribution guidelines.
• Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
• Run the following to build the project and update samples:

  ./mvnw clean package 
  ./bin/generate-samples.sh
  ./bin/utils/export_docs_generators.sh

  Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
• File the PR against the correct branch: master (6.1.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
• If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars

 
 
 class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}(
-{{#if hasValidation}}
-    {{> model_templates/validations }}
-{{/if}}
 {{#if getIsAnyType}}
     {{#if composedSchemas}}
-    schemas.ComposedSchema
+    schemas.ComposedSchema,
     {{else}}
-    schemas.AnyTypeSchema
+    schemas.AnyTypeSchema,
     {{/if}}
 {{else}}
     {{#if getHasMultipleTypes}}
@@ -34,6 +31,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{/if}}
     """
 {{/if}}
+{{#if hasValidation}}
+    {{> model_templates/validations }}
+{{/if}}
 {{#or isMap isAnyType}}
 {{> model_templates/dict_partial }}
 {{/or}}

modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_dict.handlebars

 
 
 class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}(
-{{#if hasValidation}}
-    {{> model_templates/validations }}
-{{/if}}
     schemas.DictSchema
 ):
 {{#if this.classname}}
@@ -17,6 +14,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{/if}}
     """
 {{/if}}
+{{#if hasValidation}}
+    {{> model_templates/validations }}
+{{/if}}
 {{> model_templates/dict_partial }}
 
 

modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars

 
 
 class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}(
-{{#if hasValidation}}
-    {{> model_templates/validations }}
-{{/if}}
     schemas.ListSchema
 ):
 {{#if this.classname}}
@@ -17,6 +14,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{/if}}
     """
 {{/if}}
+{{#if hasValidation}}
+    {{> model_templates/validations }}
+{{/if}}
 {{#with items}}
 {{#if complexType}}
 

modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_simple.handlebars

 
 
 class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}(
-{{#if hasValidation}}
-    {{> model_templates/validations }}
-{{/if}}
 {{#if isEnum}}
     {{> model_templates/enum_value_to_name }}
 {{/if}}
@@ -20,6 +17,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{/if}}
     """
 {{/if}}
+{{#if hasValidation}}
+    {{> model_templates/validations }}
+{{/if}}
 {{#if isEnum}}
     {{> model_templates/enums }}
 {{else}}

modules/openapi-generator/src/main/resources/python-experimental/model_templates/validations.handlebars

-schemas.SchemaValidatorClsFactory(
 {{#if getUniqueItems}}
-    unique_items=True,
-{{/if}}
-{{#if maxLength}}
-    max_length={{maxLength}},
-{{/if}}
-{{#if minLength}}
-    min_length={{minLength}},
-{{/if}}
-{{#if maxItems}}
-    max_items={{maxItems}},
-{{/if}}
-{{#if minItems}}
-    min_items={{minItems}},
+_unique_items=True
 {{/if}}
+{{#neq maxLength null}}
+_max_length={{maxLength}}
+{{/neq}}
+{{#neq minLength null}}
+_min_length={{minLength}}
+{{/neq}}
+{{#neq maxItems null}}
+_max_items={{maxItems}}
+{{/neq}}
+{{#neq minItems null}}
+_min_items={{minItems}}
+{{/neq}}
 {{#neq maxProperties null }}
-    max_properties={{maxProperties}},
+_max_properties={{maxProperties}}
 {{/neq}}
-{{#if minProperties}}
-    min_properties={{minProperties}},
-{{/if}}
-{{#if maximum}}
-    {{#if exclusiveMaximum}}exclusive_maximum{{/if}}inclusive_maximum{{#unless exclusiveMaximum}}{{/unless}}={{maximum}},
-{{/if}}
-{{#if minimum}}
-    {{#if exclusiveMinimum}}exclusive_minimum{{/if}}inclusive_minimum{{#unless exclusiveMinimum}}{{/unless}}={{minimum}},
-{{/if}}
-{{#if pattern}}
-    regex=[{
+{{#neq minProperties null}}
+_min_properties={{minProperties}}
+{{/neq}}
+{{#neq maximum null}}
+_{{#if exclusiveMaximum}}exclusive_maximum{{/if}}inclusive_maximum{{#unless exclusiveMaximum}}{{/unless}}={{maximum}}
+{{/neq}}
+{{#neq minimum null}}
+_{{#if exclusiveMinimum}}exclusive_minimum{{/if}}inclusive_minimum{{#unless exclusiveMinimum}}{{/unless}}={{minimum}}
+{{/neq}}
+{{#neq pattern null}}
+_regex=[{
 {{#if vendorExtensions.x-regex}}
-        'pattern': r'{{{vendorExtensions.x-regex}}}',  # noqa: E501
+    'pattern': r'{{{vendorExtensions.x-regex}}}',  # noqa: E501
 {{else}}
-        'pattern': r'{{{pattern}}}',  # noqa: E501
+    'pattern': r'{{{pattern}}}',  # noqa: E501
 {{/if}}
 {{#each vendorExtensions.x-modifiers}}
 {{#if @first}}
-        'flags': (
+    'flags': (
 {{/if}}
-            {{#unless @first}}| {{/unless}}re.{{.}}
+        {{#unless @first}}| {{/unless}}re.{{.}}
 {{#if @last}}
-        )
+    )
 {{/if}}
 {{/each}}
-    }],
-{{/if}}
-{{#if multipleOf}}
-    multiple_of={{multipleOf}},
-{{/if}}
-),
+}]
+{{/neq}}
+{{#neq multipleOf null}}
+_multiple_of={{multipleOf}}
+{{/neq}}

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py

@@ -24,7 +24,7 @@ from unit_test_api import schemas  # noqa: F401
 
 
 class AdditionalpropertiesAreAllowedByDefault(
-    schemas.AnyTypeSchema
+    schemas.AnyTypeSchema,
 ):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py

@@ -24,7 +24,7 @@ from unit_test_api import schemas  # noqa: F401
 
 
 class AdditionalpropertiesShouldNotLookInApplicators(
-    schemas.ComposedSchema
+    schemas.ComposedSchema,
 ):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
@@ -47,7 +47,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
         
         
         class all_of_0(
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
             foo = schemas.AnyTypeSchema
         

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py

@@ -24,7 +24,7 @@ from unit_test_api import schemas  # noqa: F401
 
 
 class Allof(
-    schemas.ComposedSchema
+    schemas.ComposedSchema,
 ):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
@@ -46,7 +46,7 @@ class Allof(
         
         
         class all_of_0(
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
             _required_property_names = {
                 "bar",
@@ -70,7 +70,7 @@ class Allof(
         
         
         class all_of_1(
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
             _required_property_names = {
                 "foo",

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py

@@ -24,7 +24,7 @@ from unit_test_api import schemas  # noqa: F401
 
 
 class AllofCombinedWithAnyofOneof(
-    schemas.ComposedSchema
+    schemas.ComposedSchema,
 ):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
@@ -46,11 +46,9 @@ class AllofCombinedWithAnyofOneof(
         
         
         class all_of_0(
-            schemas.SchemaValidatorClsFactory(
-                multiple_of=2,
-            ),
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
+            _multiple_of=2
         
             def __new__(
                 cls,
@@ -67,11 +65,9 @@ class AllofCombinedWithAnyofOneof(
         
         
         class one_of_0(
-            schemas.SchemaValidatorClsFactory(
-                multiple_of=5,
-            ),
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
+            _multiple_of=5
         
             def __new__(
                 cls,
@@ -88,11 +84,9 @@ class AllofCombinedWithAnyofOneof(
         
         
         class any_of_0(
-            schemas.SchemaValidatorClsFactory(
-                multiple_of=3,
-            ),
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
+            _multiple_of=3
         
             def __new__(
                 cls,

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py

@@ -24,7 +24,7 @@ from unit_test_api import schemas  # noqa: F401
 
 
 class AllofSimpleTypes(
-    schemas.ComposedSchema
+    schemas.ComposedSchema,
 ):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
@@ -46,11 +46,9 @@ class AllofSimpleTypes(
         
         
         class all_of_0(
-            schemas.SchemaValidatorClsFactory(
-                inclusive_maximum=30,
-            ),
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
+            _inclusive_maximum=30
         
             def __new__(
                 cls,
@@ -67,11 +65,9 @@ class AllofSimpleTypes(
         
         
         class all_of_1(
-            schemas.SchemaValidatorClsFactory(
-                inclusive_minimum=20,
-            ),
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
+            _inclusive_minimum=20
         
             def __new__(
                 cls,

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py

@@ -24,7 +24,7 @@ from unit_test_api import schemas  # noqa: F401
 
 
 class AllofWithBaseSchema(
-    schemas.ComposedSchema
+    schemas.ComposedSchema,
 ):
     """NOTE: This class is auto generated by OpenAPI Generator.
     Ref: https://openapi-generator.tech
@@ -50,7 +50,7 @@ class AllofWithBaseSchema(
         
         
         class all_of_0(
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
             _required_property_names = {
                 "foo",
@@ -74,7 +74,7 @@ class AllofWithBaseSchema(
         
         
         class all_of_1(
-            schemas.AnyTypeSchema
+            schemas.AnyTypeSchema,
         ):
             _required_property_names = {
                 "baz",