v2 consolidates validation

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -840,7 +840,12 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo
         // fix needed for values with /n /t etc in them
         String fixedName = handleSpecialCharacters(name);
         CodegenProperty cp = super.fromProperty(fixedName, p, required, schemaIsFromAdditionalProperties, sourceJsonPath);
-
+        if (cp.isInteger && cp.getFormat() == null) {
+            // this generator treats integers as type number
+            // this is done so type int + float has the same base class (decimal.Decimal)
+            // so integer validation info must be set using formatting
+            cp.setFormat("int");
+        }
         if (cp.isAnyType && cp.isNullable) {
             cp.isNullable = false;
         }
@@ -1275,6 +1280,12 @@ public CodegenModel fromModel(String name, Schema sc) {
             String pattern = (String) cm.vendorExtensions.get("x-regex");
             cm.setPattern(pattern);
         }
+        if (cm.isInteger && cm.getFormat() == null) {
+            // this generator treats integers as type number
+            // this is done so type int + float has the same base class (decimal.Decimal)
+            // so integer validation info must be set using formatting
+            cm.setFormat("int");
+        }
         if (cm.isNullable) {
             cm.setIsNull(true);
             cm.isNullable = false;

modules/openapi-json-schema-generator/src/main/resources/python/configuration.handlebars

@@ -3,22 +3,46 @@
 {{>partial_header}}
 
 import copy
+from http import client as http_client
 import logging
 {{#unless asyncio}}
 import multiprocessing
 {{/unless}}
 import sys
+import typing
+
 import urllib3
 
-from http import client as http_client
 from {{packageName}}.exceptions import ApiValueError
 
 
-JSON_SCHEMA_VALIDATION_KEYWORDS = {
-    'multipleOf', 'maximum', 'exclusiveMaximum',
-    'minimum', 'exclusiveMinimum', 'maxLength',
-    'minLength', 'pattern', 'maxItems', 'minItems',
-    'uniqueItems', 'maxProperties', 'minProperties',
+JSON_SCHEMA_KEYWORD_TO_PYTHON_KEYWORD = {
+    'types': 'types',
+    'type': 'types',
+    'enum': 'enum_value_to_name',
+    'uniqueItems': 'unique_items',
+    'minItems': 'min_items',
+    'maxItems': 'max_items',
+    'minProperties': 'min_properties',
+    'maxProperties': 'max_properties',
+    'minLength': 'min_length',
+    'maxLength': 'max_length',
+    'minimum': 'inclusive_minimum',
+    'exclusiveMinimum': 'exclusive_minimum',
+    'maximum': 'inclusive_maximum',
+    'exclusiveMaximum': 'exclusive_maximum',
+    'multipleOf': 'multiple_of',
+    'pattern': 'regex',
+    'format': 'format',
+    'required': 'required',
+    'items': 'items',
+    'properties': 'properties',
+    'additionalProperties': 'additional_properties',
+    'oneOf': 'one_of',
+    'anyOf': 'any_of',
+    'allOf': 'all_of',
+    'not': 'not_schema',
+    'discriminator': 'discriminator'
 }
 
 class Configuration(object):
@@ -37,7 +61,7 @@ class Configuration(object):
       The dict value is an API key prefix when generating the auth data.
     :param username: Username for HTTP basic authentication
     :param password: Password for HTTP basic authentication
-    :param disabled_client_side_validations (string): Comma-separated list of
+    :param disabled_json_schema_keywords (set): Set of
       JSON schema validation keywords to disable JSON schema structural validation
       rules. The following keywords may be specified: multipleOf, maximum,
       exclusiveMaximum, minimum, exclusiveMinimum, maxLength, minLength, pattern,
@@ -46,7 +70,7 @@ class Configuration(object):
       and data received from the server, independent of any validation performed by
       the server side. If the input data does not satisfy the JSON schema validation
       rules specified in the OpenAPI document, an exception is raised.
-      If disabled_client_side_validations is set, structural validation is
+      If disabled_json_schema_keywords is set, structural validation is
       disabled. This can be useful to troubleshoot data validation problem, such as
       when the OpenAPI document validation rules do not match the actual API data
       received by the server.
@@ -162,7 +186,7 @@ conf = {{{packageName}}}.Configuration(
         username=None,
         password=None,
 {{/if}}
-        disabled_client_side_validations="",
+        disabled_json_schema_keywords=frozenset(),
 {{#if hasHttpSignatureMethods}}
         signing_info=None,
 {{/if}}
@@ -214,10 +238,8 @@ conf = {{{packageName}}}.Configuration(
         """Password for HTTP basic authentication
         """
 {{/if}}
-        self.disabled_client_side_validations = disabled_client_side_validations
+        self.disabled_json_schema_keywords = disabled_json_schema_keywords
 {{#if hasHttpSignatureMethods}}
-        if signing_info is not None:
-            signing_info.host = host
         self.signing_info = signing_info
         """The HTTP signing configuration
         """
@@ -314,20 +336,39 @@ conf = {{{packageName}}}.Configuration(
         result.debug = self.debug
         return result
 
-    def __setattr__(self, name, value):
-        object.__setattr__(self, name, value)
-        if name == 'disabled_client_side_validations':
-            s = set(filter(None, value.split(',')))
-            for v in s:
-                if v not in JSON_SCHEMA_VALIDATION_KEYWORDS:
-                    raise ApiValueError(
-                        "Invalid keyword: '{0}''".format(v))
-            self._disabled_client_side_validations = s
+    @property
+    def disabled_json_schema_keywords(self) -> typing.Set[str]:
+        return self.__disabled_json_schema_keywords
+
+    @property
+    def disabled_json_schema_python_keywords(self) -> typing.Set[str]:
+        return self.__disabled_json_schema_python_keywords
+
+    @disabled_json_schema_keywords.setter
+    def disabled_json_schema_keywords(self, json_keywords: typing.Set[str]):
+        disabled_json_schema_keywords = set()
+        disabled_json_schema_python_keywords = set()
+        for k in json_keywords:
+            if k not in JSON_SCHEMA_KEYWORD_TO_PYTHON_KEYWORD:
+                raise ApiValueError(
+                    "Invalid keyword: '{0}''".format(k))
+            disabled_json_schema_keywords.add(k)
+            disabled_json_schema_python_keywords.add(JSON_SCHEMA_KEYWORD_TO_PYTHON_KEYWORD[k])
+        self.__disabled_json_schema_keywords = disabled_json_schema_keywords
+        self.__disabled_json_schema_python_keywords = disabled_json_schema_python_keywords
 {{#if hasHttpSignatureMethods}}
-        if name == "signing_info" and value is not None:
+
+    @property
+    def signing_info(self) -> typing.Optional['HttpSigningConfiguration']:
+        return self.__signing_info
+
+    @signing_info.setter
+    def signing_info(self, value: typing.Optional['HttpSigningConfiguration']):
+        if value is not None:
             # Ensure the host paramater from signing info is the same as
             # Configuration.host.
             value.host = self.host
+        self.__signing_info = value
 {{/if}}
 
     @classmethod

modules/openapi-json-schema-generator/src/main/resources/python/model_templates/composed_schemas.handlebars

@@ -1,96 +1,70 @@
 {{#with composedSchemas}}
+{{#if allOf}}
+
+class all_of:
 {{#each allOf}}
 {{#unless refClass}}
-{{> model_templates/schema }}
-{{/unless}}
-{{/each}}
-{{#each oneOf}}
-{{#unless refClass}}
-{{> model_templates/schema }}
-{{/unless}}
-{{/each}}
-{{#each anyOf}}
-{{#unless refClass}}
-{{> model_templates/schema }}
+    {{> model_templates/schema }}
+{{else}}
+
+    @staticmethod
+    def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{refClass}}']:
+        return {{refClass}}
 {{/unless}}
 {{/each}}
-{{/with}}
-{{#with composedSchemas}}
-{{#if allOf}}
-
-@classmethod
-@functools.lru_cache()
-def all_of(cls):
-    # we need this here to make our import statements work
-    # we must store _composed_schemas in here so the code is only run
-    # when we invoke this method. If we kept this at the class
-    # level we would get an error because the class level
-    # code would be run when this module is imported, and these composed
-    # classes don't exist yet because their module has not finished
-    # loading
-    return [
+    classes = [
 {{#each allOf}}
-{{#if refClass}}
-        {{refClass}},
-{{else}}
     {{#if nameInSnakeCase}}
-        cls.{{name}},
+        {{name}},
     {{else}}
-        cls.{{baseName}},
+        {{baseName}},
     {{/if}}
-{{/if}}
 {{/each}}
     ]
 {{/if}}
 {{#if oneOf}}
 
-@classmethod
-@functools.lru_cache()
-def one_of(cls):
-    # we need this here to make our import statements work
-    # we must store _composed_schemas in here so the code is only run
-    # when we invoke this method. If we kept this at the class
-    # level we would get an error because the class level
-    # code would be run when this module is imported, and these composed
-    # classes don't exist yet because their module has not finished
-    # loading
-    return [
+class one_of:
 {{#each oneOf}}
-{{#if refClass}}
-        {{refClass}},
+{{#unless refClass}}
+    {{> model_templates/schema }}
 {{else}}
+
+    @staticmethod
+    def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{refClass}}']:
+        return {{refClass}}
+{{/unless}}
+{{/each}}
+    classes = [
+{{#each oneOf}}
     {{#if nameInSnakeCase}}
-        cls.{{name}},
+        {{name}},
     {{else}}
-        cls.{{baseName}},
+        {{baseName}},
     {{/if}}
-{{/if}}
 {{/each}}
     ]
 {{/if}}
 {{#if anyOf}}
 
-@classmethod
-@functools.lru_cache()
-def any_of(cls):
-    # we need this here to make our import statements work
-    # we must store _composed_schemas in here so the code is only run
-    # when we invoke this method. If we kept this at the class
-    # level we would get an error because the class level
-    # code would be run when this module is imported, and these composed
-    # classes don't exist yet because their module has not finished
-    # loading
-    return [
+class any_of:
 {{#each anyOf}}
-{{#if refClass}}
-        {{refClass}},
+{{#unless refClass}}
+    {{> model_templates/schema }}
 {{else}}
+
+    @staticmethod
+    def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{refClass}}']:
+        return {{refClass}}
+{{/unless}}
+{{/each}}
+    classes = [
+{{#each anyOf}}
     {{#if nameInSnakeCase}}
-        cls.{{name}},
+        {{name}},
     {{else}}
-        cls.{{baseName}},
+        {{baseName}},
     {{/if}}
-{{/if}}
 {{/each}}
     ]
 {{/if}}

modules/openapi-json-schema-generator/src/main/resources/python/model_templates/format_base.handlebars

@@ -9,19 +9,4 @@ schemas.DateTimeBase,
 {{/eq}}
 {{#eq getFormat "number"}}
 schemas.DecimalBase,
-{{/eq}}
-{{#eq getFormat "binary"}}
-schemas.BinaryBase,
-{{/eq}}
-{{#eq getFormat "int32"}}
-schemas.Int32Base,
-{{/eq}}
-{{#eq getFormat "int64"}}
-schemas.Int64Base,
-{{/eq}}
-{{#eq getFormat "float"}}
-schemas.Float32Base,
-{{/eq}}
-{{#eq getFormat "double"}}
-schemas.Float64Base,
 {{/eq}}

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

@@ -5,18 +5,8 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
     {{#if getFormat}}
     {{> model_templates/format_base }}
     {{/if}}
-    {{#if composedSchemas}}
-    schemas.ComposedSchema,
-    {{else}}
     schemas.AnyTypeSchema,
-    {{/if}}
 {{else}}
-    {{#if composedSchemas}}
-    schemas.ComposedBase,
-    {{/if}}
-    {{#if isEnum}}
-    schemas.EnumBase,
-    {{/if}}
     {{> model_templates/xbase_schema }}
 {{/if}}
 ):
@@ -34,6 +24,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 
 
     class MetaOapg:
+{{#if isAnyType}}
+        # any type
+{{/if}}
         {{> model_templates/types }}
 {{#if getFormat}}
         format = '{{getFormat}}'

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

@@ -1,9 +1,6 @@
 
 
 class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}(
-{{#if isEnum}}
-    schemas.EnumBase,
-{{/if}}
     {{> model_templates/xbase_schema }}
 ):
 {{#if this.classname}}
@@ -22,6 +19,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 
 
     class MetaOapg:
+{{#if isAnyType}}
+        # any type
+{{/if}}
         {{> model_templates/types }}
 {{#if getFormat}}
         format = '{{getFormat}}'

modules/openapi-json-schema-generator/src/main/resources/python/model_templates/types.handlebars

@@ -1,8 +1,5 @@
-{{#if isAnyType}}
-types = None
-{{else}}
+{{#unless isAnyType}}
 types = {
-{{/if}}
 {{#if isNull}}
     schemas.NoneClass,
 {{/if}}
@@ -26,6 +23,5 @@ types = {
 {{#if isBoolean}}
     schemas.BoolClass,
 {{/if}}
-{{#unless isAnyType}}
 }
 {{/unless}}