[python-experimental] simplifies type checking (#13437)

* Better control of when to write MetaOapg

* Makes MetaOapg in Schema a type hint rather than assignmnet

* Samples regenerated

* Adds tuple types

* Removes types info

* Adds _types

* Samples regenerated

* Adds missing mixins, samples regenerated

* SchemaTypeChecker removed

* Samples regnerated

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

@@ -25,6 +25,7 @@ def discriminator(cls):
 {{/with}}
 {{/if}}
 {{#if vars}}
+
 class properties:
 {{#each vars}}
 {{#if complexType}}

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

@@ -0,0 +1,11 @@
+{{#with items}}
+{{#if complexType}}
+
+@classmethod
+@property
+def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+    return {{complexType}}
+{{else}}
+{{> model_templates/schema }}
+{{/if}}
+{{/with}}

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

@@ -11,9 +11,6 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
     schemas.AnyTypeSchema,
     {{/if}}
 {{else}}
-    {{#if getHasMultipleTypes}}
-    schemas.SchemaTypeCheckerClsFactory(typing.Union[{{#if isNull}}schemas.NoneClass, {{/if}}{{#if isMap}}frozendict.frozendict, {{/if}}{{#if isArray}}tuple, {{/if}}{{#if isString }}str, {{/if}}{{#or isInteger isNumber}}decimal.Decimal, {{/or}}{{#if isBoolean}}schemas.BoolClass, {{/if}}]),
-    {{/if}}
     {{#if composedSchemas}}
     schemas.ComposedBase,
     {{/if}}
@@ -41,17 +38,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{#if getFormat}}
         format = '{{getFormat}}'
 {{/if}}
-{{#with items}}
+{{#if getItems}}
-{{#if complexType}}
+        {{> model_templates/list_partial }}
-
-        @classmethod
-        @property
-        def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
-            return {{complexType}}
-{{else}}
-        {{> model_templates/schema }}
 {{/if}}
-{{/with}}
 {{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars}}
         {{> model_templates/dict_partial }}
 {{/or}}

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

@@ -14,13 +14,22 @@ class {{> model_templates/classname }}(
 {{/if}}
     """
 {{/if}}
+{{#if isStub}}
+{{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars}}
+
+
+    class MetaOapg:
+        {{> model_templates/dict_partial }}
+{{/or}}
+{{else}}
+{{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars hasValidation}}
 
 
     class MetaOapg:
         {{> model_templates/dict_partial }}
-{{#unless isStub}}
         {{> model_templates/validations }}
-{{/unless}}
+{{/or}}
+{{/if}}
     {{> model_templates/property_type_hints }}
 
     {{> model_templates/new }}

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

@@ -14,23 +14,24 @@ class {{> model_templates/classname }}(
 {{/if}}
     """
 {{/if}}
+{{#if isStub}}
+{{#if items}}
 
 
     class MetaOapg:
-{{#unless isStub}}
+        {{> model_templates/list_partial }}
-        {{> model_templates/validations }}
+{{/if}}
-{{/unless}}
+{{else}}
-{{#with items}}
+{{#or getItems hasValidation}}
-{{#if complexType}}
+
-
+
-        @classmethod
+    class MetaOapg:
-        @property
+{{#if hasValidation}}
-        def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
+        {{> model_templates/validations }}
-            return {{complexType}}
+{{/if}}
-{{else}}
+        {{> model_templates/list_partial }}
-        {{> model_templates/schema }}
+{{/or}}
 {{/if}}
-{{/with}}
 
     {{> model_templates/new }}
 

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

@@ -236,8 +236,60 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     """
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        """Returns a string phrase describing what types are allowed"""
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return "is {0}".format(all_class_names[0])
+        return "is one of [{0}]".format(", ".join(all_class_names))
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        """
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        """
+        key_or_value = "value"
+        if key_type:
+            key_or_value = "key"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -246,21 +298,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         """
         Schema _validate_oapg
-        Runs all schema validation logic and
+        All keyword validation except for type checking was done in calling stack frames
-        returns a dynamic class of different bases depending upon the input
+        If those validations passed, the validated classes are collected in path_to_schemas
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -270,6 +309,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         """
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -508,6 +555,8 @@ if typing.TYPE_CHECKING:
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
+    BytesMixin = bytes
+    FileMixin = FileIO
     # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
@@ -629,77 +678,151 @@ if typing.TYPE_CHECKING:
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
     # qty 1
-    NoneMixin = object
+    class NoneMixin:
-    FrozenDictMixin = object
+        _types = {NoneClass}
-    TupleMixin = object
+    class FrozenDictMixin:
-    StrMixin = object
+        _types = {frozendict.frozendict}
-    DecimalMixin = object
+    class TupleMixin:
-    BoolMixin = object
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
     # qty 2
-    BinaryMixin = object
+    class BinaryMixin:
-    NoneFrozenDictMixin = object
+        _types = {bytes, FileIO}
-    NoneTupleMixin = object
+    class NoneFrozenDictMixin:
-    NoneStrMixin = object
+        _types = {NoneClass, frozendict.frozendict}
-    NoneDecimalMixin = object
+    class NoneTupleMixin:
-    NoneBoolMixin = object
+        _types = {NoneClass, tuple}
-    FrozenDictTupleMixin = object
+    class NoneStrMixin:
-    FrozenDictStrMixin = object
+        _types = {NoneClass, str}
-    FrozenDictDecimalMixin = object
+    class NoneDecimalMixin:
-    FrozenDictBoolMixin = object
+        _types = {NoneClass, decimal.Decimal}
-    TupleStrMixin = object
+    class NoneBoolMixin:
-    TupleDecimalMixin = object
+        _types = {NoneClass, BoolClass}
-    TupleBoolMixin = object
+    class FrozenDictTupleMixin:
-    StrDecimalMixin = object
+        _types = {frozendict.frozendict, tuple}
-    StrBoolMixin = object
+    class FrozenDictStrMixin:
-    DecimalBoolMixin = object
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
     # qty 3
-    NoneFrozenDictTupleMixin = object
+    class NoneFrozenDictTupleMixin:
-    NoneFrozenDictStrMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple}
-    NoneFrozenDictDecimalMixin = object
+    class NoneFrozenDictStrMixin:
-    NoneFrozenDictBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, str}
-    NoneTupleStrMixin = object
+    class NoneFrozenDictDecimalMixin:
-    NoneTupleDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
-    NoneTupleBoolMixin = object
+    class NoneFrozenDictBoolMixin:
-    NoneStrDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
-    NoneStrBoolMixin = object
+    class NoneTupleStrMixin:
-    NoneDecimalBoolMixin = object
+        _types = {NoneClass, tuple, str}
-    FrozenDictTupleStrMixin = object
+    class NoneTupleDecimalMixin:
-    FrozenDictTupleDecimalMixin = object
+        _types = {NoneClass, tuple, decimal.Decimal}
-    FrozenDictTupleBoolMixin = object
+    class NoneTupleBoolMixin:
-    FrozenDictStrDecimalMixin = object
+        _types = {NoneClass, tuple, BoolClass}
-    FrozenDictStrBoolMixin = object
+    class NoneStrDecimalMixin:
-    FrozenDictDecimalBoolMixin = object
+        _types = {NoneClass, str, decimal.Decimal}
-    TupleStrDecimalMixin = object
+    class NoneStrBoolMixin:
-    TupleStrBoolMixin = object
+        _types = {NoneClass, str, BoolClass}
-    TupleDecimalBoolMixin = object
+    class NoneDecimalBoolMixin:
-    StrDecimalBoolMixin = object
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
     # qty 4
-    NoneFrozenDictTupleStrMixin = object
+    class NoneFrozenDictTupleStrMixin:
-    NoneFrozenDictTupleDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
-    NoneFrozenDictTupleBoolMixin = object
+    class NoneFrozenDictTupleDecimalMixin:
-    NoneFrozenDictStrDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
-    NoneFrozenDictStrBoolMixin = object
+    class NoneFrozenDictTupleBoolMixin:
-    NoneFrozenDictDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
-    NoneTupleStrDecimalMixin = object
+    class NoneFrozenDictStrDecimalMixin:
-    NoneTupleStrBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
-    NoneTupleDecimalBoolMixin = object
+    class NoneFrozenDictStrBoolMixin:
-    NoneStrDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
-    FrozenDictTupleStrDecimalMixin = object
+    class NoneFrozenDictDecimalBoolMixin:
-    FrozenDictTupleStrBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
-    FrozenDictTupleDecimalBoolMixin = object
+    class NoneTupleStrDecimalMixin:
-    FrozenDictStrDecimalBoolMixin = object
+        _types = {NoneClass, tuple, str, decimal.Decimal}
-    TupleStrDecimalBoolMixin = object
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
     # qty 5
-    NoneFrozenDictTupleStrDecimalMixin = object
+    class NoneFrozenDictTupleStrDecimalMixin:
-    NoneFrozenDictTupleStrBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
-    NoneFrozenDictTupleDecimalBoolMixin = object
+    class NoneFrozenDictTupleStrBoolMixin:
-    NoneFrozenDictStrDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
-    NoneTupleStrDecimalBoolMixin = object
+    class NoneFrozenDictTupleDecimalBoolMixin:
-    FrozenDictTupleStrDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
     # qty 6
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -743,92 +866,6 @@ class Validator(typing.Protocol):
         pass
 
 
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Any) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    """
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    """
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            """Returns a string phrase describing what types are allowed"""
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return "is {0}".format(all_class_names[0])
-            return "is one of [{0}]".format(", ".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            """
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            """
-            key_or_value = "value"
-            if key_type:
-                key_or_value = "key"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            """
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            """
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
 class EnumMakerBase:
     pass
 
@@ -1989,7 +2026,6 @@ class ComposedBase(Discriminable):
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -2010,7 +2046,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(tuple),
     ListBase,
     Schema,
     TupleMixin
@@ -2025,7 +2060,6 @@ class ListSchema(
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(NoneClass),
     NoneBase,
     Schema,
     NoneMixin
@@ -2040,7 +2074,6 @@ class NoneSchema(
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(decimal.Decimal),
     NumberBase,
     Schema,
     DecimalMixin
@@ -2236,7 +2269,6 @@ class Float64Schema(
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(str),
     StrBase,
     Schema,
     StrMixin
@@ -2289,8 +2321,8 @@ class DecimalSchema(DecimalBase, StrSchema):
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(bytes),
     Schema,
+    BytesMixin
 ):
     """
     this class will subclass bytes and is immutable
@@ -2300,8 +2332,8 @@ class BytesSchema(
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(FileIO),
     Schema,
+    FileMixin
 ):
     """
     This class is NOT immutable
@@ -2329,7 +2361,6 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
@@ -2346,7 +2377,6 @@ class BinarySchema(
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(BoolClass),
     BoolBase,
     Schema,
     BoolMixin
@@ -2361,9 +2391,6 @@ class BoolSchema(
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -2371,7 +2398,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -2407,7 +2434,6 @@ class NotAnyTypeSchema(
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(frozendict.frozendict),
     DictBase,
     Schema,
     FrozenDictMixin

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

@@ -33,6 +33,7 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             bar = schemas.AnyTypeSchema

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi

@@ -33,6 +33,7 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             bar = schemas.AnyTypeSchema

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

@@ -33,6 +33,7 @@ class AdditionalpropertiesAreAllowedByDefault(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             bar = schemas.AnyTypeSchema

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

@@ -33,6 +33,7 @@ class AdditionalpropertiesAreAllowedByDefault(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             bar = schemas.AnyTypeSchema

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

@@ -42,6 +42,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.AnyTypeSchema
                     __annotations__ = {

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

@@ -42,6 +42,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.AnyTypeSchema
                     __annotations__ = {

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

@@ -44,6 +44,7 @@ class Allof(
                 required = {
                     "bar",
                 }
+                
                 class properties:
                     bar = schemas.IntSchema
                     __annotations__ = {
@@ -99,6 +100,7 @@ class Allof(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

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

@@ -44,6 +44,7 @@ class Allof(
                 required = {
                     "bar",
                 }
+                
                 class properties:
                     bar = schemas.IntSchema
                     __annotations__ = {
@@ -99,6 +100,7 @@ class Allof(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

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

@@ -36,6 +36,7 @@ class AllofWithBaseSchema(
         required = {
             "bar",
         }
+        
         class properties:
             bar = schemas.IntSchema
             __annotations__ = {
@@ -52,6 +53,7 @@ class AllofWithBaseSchema(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {
@@ -107,6 +109,7 @@ class AllofWithBaseSchema(
                 required = {
                     "baz",
                 }
+                
                 class properties:
                     baz = schemas.NoneSchema
                     __annotations__ = {

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

@@ -36,6 +36,7 @@ class AllofWithBaseSchema(
         required = {
             "bar",
         }
+        
         class properties:
             bar = schemas.IntSchema
             __annotations__ = {
@@ -52,6 +53,7 @@ class AllofWithBaseSchema(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {
@@ -107,6 +109,7 @@ class AllofWithBaseSchema(
                 required = {
                     "baz",
                 }
+                
                 class properties:
                     baz = schemas.NoneSchema
                     __annotations__ = {

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

@@ -44,6 +44,7 @@ class AnyofComplexTypes(
                 required = {
                     "bar",
                 }
+                
                 class properties:
                     bar = schemas.IntSchema
                     __annotations__ = {
@@ -99,6 +100,7 @@ class AnyofComplexTypes(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi

@@ -44,6 +44,7 @@ class AnyofComplexTypes(
                 required = {
                     "bar",
                 }
+                
                 class properties:
                     bar = schemas.IntSchema
                     __annotations__ = {
@@ -99,6 +100,7 @@ class AnyofComplexTypes(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

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

@@ -36,6 +36,7 @@ class EnumsInProperties(
         required = {
             "bar",
         }
+        
         class properties:
             
             

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi

@@ -36,6 +36,7 @@ class EnumsInProperties(
         required = {
             "bar",
         }
+        
         class properties:
             
             

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

@@ -33,6 +33,7 @@ class ForbiddenProperty(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.NotAnyTypeSchema
             __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi

@@ -33,6 +33,7 @@ class ForbiddenProperty(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.NotAnyTypeSchema
             __annotations__ = {

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

@@ -33,6 +33,7 @@ class InvalidStringValueForDefault(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi

@@ -33,6 +33,7 @@ class InvalidStringValueForDefault(
 
 
     class MetaOapg:
+        
         class properties:
             
             

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

@@ -41,6 +41,7 @@ class NotMoreComplexSchema(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi

@@ -41,6 +41,7 @@ class NotMoreComplexSchema(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

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

@@ -33,6 +33,7 @@ class ObjectPropertiesValidation(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.IntSchema
             bar = schemas.StrSchema

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi

@@ -33,6 +33,7 @@ class ObjectPropertiesValidation(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.IntSchema
             bar = schemas.StrSchema

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

@@ -44,6 +44,7 @@ class OneofComplexTypes(
                 required = {
                     "bar",
                 }
+                
                 class properties:
                     bar = schemas.IntSchema
                     __annotations__ = {
@@ -99,6 +100,7 @@ class OneofComplexTypes(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi

@@ -44,6 +44,7 @@ class OneofComplexTypes(
                 required = {
                     "bar",
                 }
+                
                 class properties:
                     bar = schemas.IntSchema
                     __annotations__ = {
@@ -99,6 +100,7 @@ class OneofComplexTypes(
                 required = {
                     "foo",
                 }
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

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

@@ -33,6 +33,7 @@ class PropertiesWithEscapedCharacters(
 
 
     class MetaOapg:
+        
         class properties:
             foo_nbar = schemas.NumberSchema
             foo_bar = schemas.NumberSchema

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi

@@ -33,6 +33,7 @@ class PropertiesWithEscapedCharacters(
 
 
     class MetaOapg:
+        
         class properties:
             foo_nbar = schemas.NumberSchema
             foo_bar = schemas.NumberSchema

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

@@ -33,6 +33,7 @@ class PropertyNamedRefThatIsNotAReference(
 
 
     class MetaOapg:
+        
         class properties:
             ref = schemas.StrSchema
             __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi

@@ -33,6 +33,7 @@ class PropertyNamedRefThatIsNotAReference(
 
 
     class MetaOapg:
+        
         class properties:
             ref = schemas.StrSchema
             __annotations__ = {

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

@@ -33,7 +33,7 @@ class RefInItems(
 
 
     class MetaOapg:
-
+        
         @classmethod
         @property
         def items(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.pyi

@@ -33,7 +33,7 @@ class RefInItems(
 
 
     class MetaOapg:
-
+        
         @classmethod
         @property
         def items(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:

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

@@ -33,6 +33,7 @@ class RefInProperty(
 
 
     class MetaOapg:
+        
         class properties:
         
             @classmethod

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi

@@ -33,6 +33,7 @@ class RefInProperty(
 
 
     class MetaOapg:
+        
         class properties:
         
             @classmethod

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

@@ -33,6 +33,7 @@ class RequiredDefaultValidation(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi

@@ -33,6 +33,7 @@ class RequiredDefaultValidation(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             __annotations__ = {

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

@@ -36,6 +36,7 @@ class RequiredValidation(
         required = {
             "foo",
         }
+        
         class properties:
             foo = schemas.AnyTypeSchema
             bar = schemas.AnyTypeSchema

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi

@@ -36,6 +36,7 @@ class RequiredValidation(
         required = {
             "foo",
         }
+        
         class properties:
             foo = schemas.AnyTypeSchema
             bar = schemas.AnyTypeSchema

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

@@ -33,6 +33,7 @@ class RequiredWithEmptyArray(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi

@@ -33,6 +33,7 @@ class RequiredWithEmptyArray(
 
 
     class MetaOapg:
+        
         class properties:
             foo = schemas.AnyTypeSchema
             __annotations__ = {

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

@@ -33,6 +33,7 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi

@@ -33,6 +33,7 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py

@@ -42,6 +42,7 @@ class SchemaForRequestBodyApplicationJson(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.pyi

@@ -40,6 +40,7 @@ class SchemaForRequestBodyApplicationJson(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py

@@ -41,6 +41,7 @@ class SchemaFor200ResponseBodyApplicationJson(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.pyi

@@ -39,6 +39,7 @@ class SchemaFor200ResponseBodyApplicationJson(
         
         
             class MetaOapg:
+                
                 class properties:
                     foo = schemas.StrSchema
                     __annotations__ = {

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

@@ -243,8 +243,60 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     """
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
+    _types: typing.Set[typing.Type]
     MetaOapg = MetaOapgTyped
 
+    @staticmethod
+    def __get_valid_classes_phrase(input_classes):
+        """Returns a string phrase describing what types are allowed"""
+        all_classes = list(input_classes)
+        all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
+        all_class_names = [cls.__name__ for cls in all_classes]
+        if len(all_class_names) == 1:
+            return "is {0}".format(all_class_names[0])
+        return "is one of [{0}]".format(", ".join(all_class_names))
+
+    @classmethod
+    def __type_error_message(
+        cls, var_value=None, var_name=None, valid_classes=None, key_type=None
+    ):
+        """
+        Keyword Args:
+            var_value (any): the variable which has the type_error
+            var_name (str): the name of the variable which has the typ error
+            valid_classes (tuple): the accepted classes for current_item's
+                                      value
+            key_type (bool): False if our value is a value in a dict
+                             True if it is a key in a dict
+                             False if our item is an item in a tuple
+        """
+        key_or_value = "value"
+        if key_type:
+            key_or_value = "key"
+        valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
+        msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
+            var_name,
+            key_or_value,
+            valid_classes_phrase,
+            type(var_value).__name__,
+        )
+        return msg
+
+    @classmethod
+    def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
+        error_msg = cls.__type_error_message(
+            var_name=path_to_item[-1],
+            var_value=var_value,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+        return ApiTypeError(
+            error_msg,
+            path_to_item=path_to_item,
+            valid_classes=valid_classes,
+            key_type=key_type,
+        )
+
     @classmethod
     def _validate_oapg(
         cls,
@@ -253,21 +305,8 @@ class Schema:
     ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
         """
         Schema _validate_oapg
-        Runs all schema validation logic and
+        All keyword validation except for type checking was done in calling stack frames
-        returns a dynamic class of different bases depending upon the input
+        If those validations passed, the validated classes are collected in path_to_schemas
-        This makes it so:
-        - the returned instance is always a subclass of our defining schema
-            - this allows us to check type based on whether an instance is a subclass of a schema
-        - the returned instance is a serializable type (except for None, True, and False) which are enums
-
-        Use cases:
-        1. inheritable type: string/decimal.Decimal/frozendict.frozendict/tuple
-        2. singletons: bool/None -> uses the base classes BoolClass/NoneClass
-
-        Required Steps:
-        1. verify type of input is valid vs the allowed _types
-        2. check validations that are applicable for this type of input
-        3. if enums exist, check that the value exists in the enum
 
         Returns:
             path_to_schemas: a map of path to schemas
@@ -277,6 +316,14 @@ class Schema:
             ApiTypeError: when the input type is not in the list of allowed spec types
         """
         base_class = type(arg)
+        if base_class not in cls._types:
+            raise cls.__get_type_error(
+                arg,
+                validation_metadata.path_to_item,
+                cls._types,
+                key_type=False,
+            )
+
         path_to_schemas = {validation_metadata.path_to_item: set()}
         path_to_schemas[validation_metadata.path_to_item].add(cls)
         path_to_schemas[validation_metadata.path_to_item].add(base_class)
@@ -515,6 +562,8 @@ if typing.TYPE_CHECKING:
     StrMixin = str
     DecimalMixin = decimal.Decimal
     BoolMixin = BoolClass
+    BytesMixin = bytes
+    FileMixin = FileIO
     # qty 2
     class BinaryMixin(bytes, FileIO):
         pass
@@ -636,77 +685,151 @@ if typing.TYPE_CHECKING:
     # qty 6
     class NoneFrozenDictTupleStrDecimalBoolMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass):
         pass
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin(NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes):
+        pass
 else:
     # qty 1
-    NoneMixin = object
+    class NoneMixin:
-    FrozenDictMixin = object
+        _types = {NoneClass}
-    TupleMixin = object
+    class FrozenDictMixin:
-    StrMixin = object
+        _types = {frozendict.frozendict}
-    DecimalMixin = object
+    class TupleMixin:
-    BoolMixin = object
+        _types = {tuple}
+    class StrMixin:
+        _types = {str}
+    class DecimalMixin:
+        _types = {decimal.Decimal}
+    class BoolMixin:
+        _types = {BoolClass}
+    class BytesMixin:
+        _types = {bytes}
+    class FileMixin:
+        _types = {FileIO}
     # qty 2
-    BinaryMixin = object
+    class BinaryMixin:
-    NoneFrozenDictMixin = object
+        _types = {bytes, FileIO}
-    NoneTupleMixin = object
+    class NoneFrozenDictMixin:
-    NoneStrMixin = object
+        _types = {NoneClass, frozendict.frozendict}
-    NoneDecimalMixin = object
+    class NoneTupleMixin:
-    NoneBoolMixin = object
+        _types = {NoneClass, tuple}
-    FrozenDictTupleMixin = object
+    class NoneStrMixin:
-    FrozenDictStrMixin = object
+        _types = {NoneClass, str}
-    FrozenDictDecimalMixin = object
+    class NoneDecimalMixin:
-    FrozenDictBoolMixin = object
+        _types = {NoneClass, decimal.Decimal}
-    TupleStrMixin = object
+    class NoneBoolMixin:
-    TupleDecimalMixin = object
+        _types = {NoneClass, BoolClass}
-    TupleBoolMixin = object
+    class FrozenDictTupleMixin:
-    StrDecimalMixin = object
+        _types = {frozendict.frozendict, tuple}
-    StrBoolMixin = object
+    class FrozenDictStrMixin:
-    DecimalBoolMixin = object
+        _types = {frozendict.frozendict, str}
+    class FrozenDictDecimalMixin:
+        _types = {frozendict.frozendict, decimal.Decimal}
+    class FrozenDictBoolMixin:
+        _types = {frozendict.frozendict, BoolClass}
+    class TupleStrMixin:
+        _types = {tuple, str}
+    class TupleDecimalMixin:
+        _types = {tuple, decimal.Decimal}
+    class TupleBoolMixin:
+        _types = {tuple, BoolClass}
+    class StrDecimalMixin:
+        _types = {str, decimal.Decimal}
+    class StrBoolMixin:
+        _types = {str, BoolClass}
+    class DecimalBoolMixin:
+        _types = {decimal.Decimal, BoolClass}
     # qty 3
-    NoneFrozenDictTupleMixin = object
+    class NoneFrozenDictTupleMixin:
-    NoneFrozenDictStrMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple}
-    NoneFrozenDictDecimalMixin = object
+    class NoneFrozenDictStrMixin:
-    NoneFrozenDictBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, str}
-    NoneTupleStrMixin = object
+    class NoneFrozenDictDecimalMixin:
-    NoneTupleDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal}
-    NoneTupleBoolMixin = object
+    class NoneFrozenDictBoolMixin:
-    NoneStrDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, BoolClass}
-    NoneStrBoolMixin = object
+    class NoneTupleStrMixin:
-    NoneDecimalBoolMixin = object
+        _types = {NoneClass, tuple, str}
-    FrozenDictTupleStrMixin = object
+    class NoneTupleDecimalMixin:
-    FrozenDictTupleDecimalMixin = object
+        _types = {NoneClass, tuple, decimal.Decimal}
-    FrozenDictTupleBoolMixin = object
+    class NoneTupleBoolMixin:
-    FrozenDictStrDecimalMixin = object
+        _types = {NoneClass, tuple, BoolClass}
-    FrozenDictStrBoolMixin = object
+    class NoneStrDecimalMixin:
-    FrozenDictDecimalBoolMixin = object
+        _types = {NoneClass, str, decimal.Decimal}
-    TupleStrDecimalMixin = object
+    class NoneStrBoolMixin:
-    TupleStrBoolMixin = object
+        _types = {NoneClass, str, BoolClass}
-    TupleDecimalBoolMixin = object
+    class NoneDecimalBoolMixin:
-    StrDecimalBoolMixin = object
+        _types = {NoneClass, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrMixin:
+        _types = {frozendict.frozendict, tuple, str}
+    class FrozenDictTupleDecimalMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal}
+    class FrozenDictTupleBoolMixin:
+        _types = {frozendict.frozendict, tuple, BoolClass}
+    class FrozenDictStrDecimalMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal}
+    class FrozenDictStrBoolMixin:
+        _types = {frozendict.frozendict, str, BoolClass}
+    class FrozenDictDecimalBoolMixin:
+        _types = {frozendict.frozendict, decimal.Decimal, BoolClass}
+    class TupleStrDecimalMixin:
+        _types = {tuple, str, decimal.Decimal}
+    class TupleStrBoolMixin:
+        _types = {tuple, str, BoolClass}
+    class TupleDecimalBoolMixin:
+        _types = {tuple, decimal.Decimal, BoolClass}
+    class StrDecimalBoolMixin:
+        _types = {str, decimal.Decimal, BoolClass}
     # qty 4
-    NoneFrozenDictTupleStrMixin = object
+    class NoneFrozenDictTupleStrMixin:
-    NoneFrozenDictTupleDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, str}
-    NoneFrozenDictTupleBoolMixin = object
+    class NoneFrozenDictTupleDecimalMixin:
-    NoneFrozenDictStrDecimalMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal}
-    NoneFrozenDictStrBoolMixin = object
+    class NoneFrozenDictTupleBoolMixin:
-    NoneFrozenDictDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, BoolClass}
-    NoneTupleStrDecimalMixin = object
+    class NoneFrozenDictStrDecimalMixin:
-    NoneTupleStrBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal}
-    NoneTupleDecimalBoolMixin = object
+    class NoneFrozenDictStrBoolMixin:
-    NoneStrDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, str, BoolClass}
-    FrozenDictTupleStrDecimalMixin = object
+    class NoneFrozenDictDecimalBoolMixin:
-    FrozenDictTupleStrBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, decimal.Decimal, BoolClass}
-    FrozenDictTupleDecimalBoolMixin = object
+    class NoneTupleStrDecimalMixin:
-    FrozenDictStrDecimalBoolMixin = object
+        _types = {NoneClass, tuple, str, decimal.Decimal}
-    TupleStrDecimalBoolMixin = object
+    class NoneTupleStrBoolMixin:
+        _types = {NoneClass, tuple, str, BoolClass}
+    class NoneTupleDecimalBoolMixin:
+        _types = {NoneClass, tuple, decimal.Decimal, BoolClass}
+    class NoneStrDecimalBoolMixin:
+        _types = {NoneClass, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal}
+    class FrozenDictTupleStrBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, BoolClass}
+    class FrozenDictTupleDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class FrozenDictStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class TupleStrDecimalBoolMixin:
+        _types = {tuple, str, decimal.Decimal, BoolClass}
     # qty 5
-    NoneFrozenDictTupleStrDecimalMixin = object
+    class NoneFrozenDictTupleStrDecimalMixin:
-    NoneFrozenDictTupleStrBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal}
-    NoneFrozenDictTupleDecimalBoolMixin = object
+    class NoneFrozenDictTupleStrBoolMixin:
-    NoneFrozenDictStrDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, str, BoolClass}
-    NoneTupleStrDecimalBoolMixin = object
+    class NoneFrozenDictTupleDecimalBoolMixin:
-    FrozenDictTupleStrDecimalBoolMixin = object
+        _types = {NoneClass, frozendict.frozendict, tuple, decimal.Decimal, BoolClass}
+    class NoneFrozenDictStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, str, decimal.Decimal, BoolClass}
+    class NoneTupleStrDecimalBoolMixin:
+        _types = {NoneClass, tuple, str, decimal.Decimal, BoolClass}
+    class FrozenDictTupleStrDecimalBoolMixin:
+        _types = {frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
     # qty 6
-    NoneFrozenDictTupleStrDecimalBoolMixin = object
+    class NoneFrozenDictTupleStrDecimalBoolMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass}
+    # qty 8
+    class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
+        _types = {NoneClass, frozendict.frozendict, tuple, str, decimal.Decimal, BoolClass, FileIO, bytes}
 
 
 class ValidatorBase:
@@ -750,92 +873,6 @@ class Validator(typing.Protocol):
         pass
 
 
-def SchemaTypeCheckerClsFactory(union_type_cls: typing.Any) -> Validator:
-    if typing.get_origin(union_type_cls) is typing.Union:
-        union_classes = typing.get_args(union_type_cls)
-    else:
-        # note: when a union of a single class is passed in, the union disappears
-        union_classes = tuple([union_type_cls])
-    """
-    I want the type hint... union_type_cls
-    and to use it as a base class but when I do, I get
-    TypeError: metaclass conflict: the metaclass of a derived class must be a (non-strict) subclass of the metaclasses of all its bases
-    """
-    class SchemaTypeChecker:
-        @staticmethod
-        def __get_valid_classes_phrase(input_classes):
-            """Returns a string phrase describing what types are allowed"""
-            all_classes = list(input_classes)
-            all_classes = sorted(all_classes, key=lambda cls: cls.__name__)
-            all_class_names = [cls.__name__ for cls in all_classes]
-            if len(all_class_names) == 1:
-                return "is {0}".format(all_class_names[0])
-            return "is one of [{0}]".format(", ".join(all_class_names))
-
-        @classmethod
-        def __type_error_message(
-            cls, var_value=None, var_name=None, valid_classes=None, key_type=None
-        ):
-            """
-            Keyword Args:
-                var_value (any): the variable which has the type_error
-                var_name (str): the name of the variable which has the typ error
-                valid_classes (tuple): the accepted classes for current_item's
-                                          value
-                key_type (bool): False if our value is a value in a dict
-                                 True if it is a key in a dict
-                                 False if our item is an item in a tuple
-            """
-            key_or_value = "value"
-            if key_type:
-                key_or_value = "key"
-            valid_classes_phrase = cls.__get_valid_classes_phrase(valid_classes)
-            msg = "Invalid type. Required {1} type {2} and " "passed type was {3}".format(
-                var_name,
-                key_or_value,
-                valid_classes_phrase,
-                type(var_value).__name__,
-            )
-            return msg
-
-        @classmethod
-        def __get_type_error(cls, var_value, path_to_item, valid_classes, key_type=False):
-            error_msg = cls.__type_error_message(
-                var_name=path_to_item[-1],
-                var_value=var_value,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-            return ApiTypeError(
-                error_msg,
-                path_to_item=path_to_item,
-                valid_classes=valid_classes,
-                key_type=key_type,
-            )
-
-        @classmethod
-        def _validate_oapg(
-            cls,
-            arg,
-            validation_metadata: ValidationMetadata,
-        ) -> typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]]:
-            """
-            SchemaTypeChecker _validate_oapg
-            Validates arg's type
-            """
-            arg_type = type(arg)
-            if arg_type in union_classes:
-                return super()._validate_oapg(arg, validation_metadata=validation_metadata)
-            raise cls.__get_type_error(
-                arg,
-                validation_metadata.path_to_item,
-                union_classes,
-                key_type=False,
-            )
-
-    return SchemaTypeChecker
-
-
 class EnumMakerBase:
     pass
 
@@ -1996,7 +2033,6 @@ class ComposedBase(Discriminable):
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    SchemaTypeCheckerClsFactory(typing.Union[NoneClass, str, decimal.Decimal, BoolClass, tuple, frozendict.frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -2017,7 +2053,6 @@ class ComposedSchema(
 
 
 class ListSchema(
-    SchemaTypeCheckerClsFactory(tuple),
     ListBase,
     Schema,
     TupleMixin
@@ -2032,7 +2067,6 @@ class ListSchema(
 
 
 class NoneSchema(
-    SchemaTypeCheckerClsFactory(NoneClass),
     NoneBase,
     Schema,
     NoneMixin
@@ -2047,7 +2081,6 @@ class NoneSchema(
 
 
 class NumberSchema(
-    SchemaTypeCheckerClsFactory(decimal.Decimal),
     NumberBase,
     Schema,
     DecimalMixin
@@ -2243,7 +2276,6 @@ class Float64Schema(
 
 
 class StrSchema(
-    SchemaTypeCheckerClsFactory(str),
     StrBase,
     Schema,
     StrMixin
@@ -2296,8 +2328,8 @@ class DecimalSchema(DecimalBase, StrSchema):
 
 
 class BytesSchema(
-    SchemaTypeCheckerClsFactory(bytes),
     Schema,
+    BytesMixin
 ):
     """
     this class will subclass bytes and is immutable
@@ -2307,8 +2339,8 @@ class BytesSchema(
 
 
 class FileSchema(
-    SchemaTypeCheckerClsFactory(FileIO),
     Schema,
+    FileMixin
 ):
     """
     This class is NOT immutable
@@ -2336,7 +2368,6 @@ class BinaryBase:
 
 
 class BinarySchema(
-    SchemaTypeCheckerClsFactory(typing.Union[bytes, FileIO]),
     ComposedBase,
     BinaryBase,
     Schema,
@@ -2353,7 +2384,6 @@ class BinarySchema(
 
 
 class BoolSchema(
-    SchemaTypeCheckerClsFactory(BoolClass),
     BoolBase,
     Schema,
     BoolMixin
@@ -2368,9 +2398,6 @@ class BoolSchema(
 
 
 class AnyTypeSchema(
-    SchemaTypeCheckerClsFactory(
-        typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, BoolClass, NoneClass, bytes, FileIO]
-    ),
     DictBase,
     ListBase,
     NumberBase,
@@ -2378,7 +2405,7 @@ class AnyTypeSchema(
     BoolBase,
     NoneBase,
     Schema,
-    NoneFrozenDictTupleStrDecimalBoolMixin
+    NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
     pass
@@ -2414,7 +2441,6 @@ class NotAnyTypeSchema(
 
 
 class DictSchema(
-    SchemaTypeCheckerClsFactory(frozendict.frozendict),
     DictBase,
     Schema,
     FrozenDictMixin

samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py

@@ -33,6 +33,7 @@ class AdditionalPropertiesClass(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi

@@ -33,6 +33,7 @@ class AdditionalPropertiesClass(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py

@@ -41,7 +41,7 @@ class AdditionalPropertiesWithArrayOfEnums(
         
         
             class MetaOapg:
-        
+                
                 @classmethod
                 @property
                 def items(cls) -> typing.Type['EnumClass']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi

@@ -41,7 +41,7 @@ class AdditionalPropertiesWithArrayOfEnums(
         
         
             class MetaOapg:
-        
+                
                 @classmethod
                 @property
                 def items(cls) -> typing.Type['EnumClass']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py

@@ -46,6 +46,7 @@ class Animal(
                     'Dog': Dog,
                 }
             }
+        
         class properties:
             className = schemas.StrSchema
             color = schemas.StrSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi

@@ -46,6 +46,7 @@ class Animal(
                     'Dog': Dog,
                 }
             }
+        
         class properties:
             className = schemas.StrSchema
             color = schemas.StrSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py

@@ -33,7 +33,7 @@ class AnimalFarm(
 
 
     class MetaOapg:
-
+        
         @classmethod
         @property
         def items(cls) -> typing.Type['Animal']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.pyi

@@ -33,7 +33,7 @@ class AnimalFarm(
 
 
     class MetaOapg:
-
+        
         @classmethod
         @property
         def items(cls) -> typing.Type['Animal']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.py

@@ -33,6 +33,7 @@ class AnyTypeAndFormat(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_and_format.pyi

@@ -33,6 +33,7 @@ class AnyTypeAndFormat(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py

@@ -33,6 +33,7 @@ class ApiResponse(
 
 
     class MetaOapg:
+        
         class properties:
             code = schemas.Int32Schema
             type = schemas.StrSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi

@@ -33,6 +33,7 @@ class ApiResponse(
 
 
     class MetaOapg:
+        
         class properties:
             code = schemas.Int32Schema
             type = schemas.StrSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py

@@ -23,7 +23,6 @@ from petstore_api import schemas  # noqa: F401
 
 
 class Apple(
-    schemas.SchemaTypeCheckerClsFactory(typing.Union[schemas.NoneClass, frozendict.frozendict, ]),
     schemas.DictBase,
     schemas.NoneBase,
     schemas.Schema,
@@ -40,6 +39,7 @@ class Apple(
         required = {
             "cultivar",
         }
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi

@@ -23,7 +23,6 @@ from petstore_api import schemas  # noqa: F401
 
 
 class Apple(
-    schemas.SchemaTypeCheckerClsFactory(typing.Union[schemas.NoneClass, frozendict.frozendict, ]),
     schemas.DictBase,
     schemas.NoneBase,
     schemas.Schema,
@@ -40,6 +39,7 @@ class Apple(
         required = {
             "cultivar",
         }
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py

@@ -36,6 +36,7 @@ class AppleReq(
         required = {
             "cultivar",
         }
+        
         class properties:
             cultivar = schemas.StrSchema
             mealy = schemas.BoolSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi

@@ -36,6 +36,7 @@ class AppleReq(
         required = {
             "cultivar",
         }
+        
         class properties:
             cultivar = schemas.StrSchema
             mealy = schemas.BoolSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py

@@ -33,6 +33,7 @@ class ArrayOfArrayOfNumberOnly(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi

@@ -33,6 +33,7 @@ class ArrayOfArrayOfNumberOnly(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py

@@ -33,7 +33,7 @@ class ArrayOfEnums(
 
 
     class MetaOapg:
-
+        
         @classmethod
         @property
         def items(cls) -> typing.Type['StringEnum']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.pyi

@@ -33,7 +33,7 @@ class ArrayOfEnums(
 
 
     class MetaOapg:
-
+        
         @classmethod
         @property
         def items(cls) -> typing.Type['StringEnum']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py

@@ -33,6 +33,7 @@ class ArrayOfNumberOnly(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi

@@ -33,6 +33,7 @@ class ArrayOfNumberOnly(
 
 
     class MetaOapg:
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py

@@ -33,6 +33,7 @@ class ArrayTest(
 
 
     class MetaOapg:
+        
         class properties:
             
             
@@ -118,7 +119,7 @@ class ArrayTest(
                     
                     
                         class MetaOapg:
-                    
+                            
                             @classmethod
                             @property
                             def items(cls) -> typing.Type['ReadOnlyFirst']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi

@@ -33,6 +33,7 @@ class ArrayTest(
 
 
     class MetaOapg:
+        
         class properties:
             
             
@@ -118,7 +119,7 @@ class ArrayTest(
                     
                     
                         class MetaOapg:
-                    
+                            
                             @classmethod
                             @property
                             def items(cls) -> typing.Type['ReadOnlyFirst']:

samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py

@@ -36,6 +36,7 @@ class Banana(
         required = {
             "lengthCm",
         }
+        
         class properties:
             lengthCm = schemas.NumberSchema
             __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi

@@ -36,6 +36,7 @@ class Banana(
         required = {
             "lengthCm",
         }
+        
         class properties:
             lengthCm = schemas.NumberSchema
             __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py

@@ -36,6 +36,7 @@ class BananaReq(
         required = {
             "lengthCm",
         }
+        
         class properties:
             lengthCm = schemas.NumberSchema
             sweet = schemas.BoolSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi

@@ -36,6 +36,7 @@ class BananaReq(
         required = {
             "lengthCm",
         }
+        
         class properties:
             lengthCm = schemas.NumberSchema
             sweet = schemas.BoolSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py

@@ -36,6 +36,7 @@ class BasquePig(
         required = {
             "className",
         }
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi

@@ -36,6 +36,7 @@ class BasquePig(
         required = {
             "className",
         }
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py

@@ -33,6 +33,7 @@ class Capitalization(
 
 
     class MetaOapg:
+        
         class properties:
             smallCamel = schemas.StrSchema
             CapitalCamel = schemas.StrSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi

@@ -33,6 +33,7 @@ class Capitalization(
 
 
     class MetaOapg:
+        
         class properties:
             smallCamel = schemas.StrSchema
             CapitalCamel = schemas.StrSchema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py

@@ -41,6 +41,7 @@ class Cat(
         
         
             class MetaOapg:
+                
                 class properties:
                     declawed = schemas.BoolSchema
                     __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi

@@ -41,6 +41,7 @@ class Cat(
         
         
             class MetaOapg:
+                
                 class properties:
                     declawed = schemas.BoolSchema
                     __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py

@@ -36,6 +36,7 @@ class Category(
         required = {
             "name",
         }
+        
         class properties:
             name = schemas.StrSchema
             id = schemas.Int64Schema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi

@@ -36,6 +36,7 @@ class Category(
         required = {
             "name",
         }
+        
         class properties:
             name = schemas.StrSchema
             id = schemas.Int64Schema

samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py

@@ -41,6 +41,7 @@ class ChildCat(
         
         
             class MetaOapg:
+                
                 class properties:
                     name = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi

@@ -41,6 +41,7 @@ class ChildCat(
         
         
             class MetaOapg:
+                
                 class properties:
                     name = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py

@@ -35,6 +35,7 @@ class ClassModel(
 
 
     class MetaOapg:
+        
         class properties:
             _class = schemas.StrSchema
             __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi

@@ -35,6 +35,7 @@ class ClassModel(
 
 
     class MetaOapg:
+        
         class properties:
             _class = schemas.StrSchema
             __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py

@@ -33,6 +33,7 @@ class Client(
 
 
     class MetaOapg:
+        
         class properties:
             client = schemas.StrSchema
             __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi

@@ -33,6 +33,7 @@ class Client(
 
 
     class MetaOapg:
+        
         class properties:
             client = schemas.StrSchema
             __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py

@@ -41,6 +41,7 @@ class ComplexQuadrilateral(
         
         
             class MetaOapg:
+                
                 class properties:
                     
                     

samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi

@@ -41,6 +41,7 @@ class ComplexQuadrilateral(
         
         
             class MetaOapg:
+                
                 class properties:
                     
                     

samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi

@@ -43,9 +43,6 @@ class ComposedOneOfDifferentTypes(
             schemas.DictSchema
         ):
         
-        
-            class MetaOapg:
-        
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],

samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py

@@ -36,6 +36,7 @@ class DanishPig(
         required = {
             "className",
         }
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi

@@ -36,6 +36,7 @@ class DanishPig(
         required = {
             "className",
         }
+        
         class properties:
             
             

samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py

@@ -41,6 +41,7 @@ class Dog(
         
         
             class MetaOapg:
+                
                 class properties:
                     breed = schemas.StrSchema
                     __annotations__ = {

samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi

@@ -41,6 +41,7 @@ class Dog(
         
         
             class MetaOapg:
+                
                 class properties:
                     breed = schemas.StrSchema
                     __annotations__ = {