python-experimental adds DecimalSchema (#11282)

* Fixes test

* Adds decimal examples to the pythonExp generator

* Adds isDecimal to CodegenModel, updates python-exp samples

* Fixes decimal types in ObjectModelWIthDecimalProperties and DecimalPayload

* Updates tests

* Decimal feature added to python-exp docs

* Samples and docs regenerated

docs/generators/python-experimental.md

@@ -11,7 +11,7 @@ title: Documentation for the python-experimental Generator
 | generator type | CLIENT | |
 | generator language | Python | |
 | generator language version | >=3.9 | |
-| helpTxt | Generates a Python client library<br /><br />Features in this generator:<br />- type hints on endpoints and model creation<br />- model parameter names use the spec defined keys and cases<br />- robust composition (oneOf/anyOf/allOf) where paload data is stored in one instance only<br />- endpoint parameter names use the spec defined keys and cases<br />- inline schemas are supported at any location including composition<br />- multiple content types supported in request body and response bodies<br />- run time type checking<br />- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br />- all instances of schemas dynamically inherit from all matching schemas so one can use isinstance to check if validation passed<br />- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br />- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor<br />    - Exceptions: int/float is stored as Decimal, When receiving data from headers it will start as str and may need to be cast for example to int | |
+| helpTxt | Generates a Python client library<br /><br />Features in this generator:<br />- type hints on endpoints and model creation<br />- model parameter names use the spec defined keys and cases<br />- robust composition (oneOf/anyOf/allOf) where paload data is stored in one instance only<br />- endpoint parameter names use the spec defined keys and cases<br />- inline schemas are supported at any location including composition<br />- multiple content types supported in request body and response bodies<br />- run time type checking<br />- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema<br />- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br />- all instances of schemas dynamically inherit from all matching schemas so one can use isinstance to check if validation passed<br />- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br />- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor<br />    - Exceptions: int/float is stored as Decimal, When receiving data from headers it will start as str and may need to be cast for example to int | |
 
 ## CONFIG OPTIONS
 These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java

@@ -64,7 +64,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
     public String defaultValue;
     public String arrayModelType;
     public boolean isAlias; // Is this effectively an alias of another simple type
-    public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime, isShort, isUnboundedInteger, isBoolean;
+    public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime, isDecimal, isShort, isUnboundedInteger, isBoolean;
     private boolean additionalPropertiesIsAnyType;
     public List<CodegenProperty> vars = new ArrayList<>(); // all properties (without parent's properties)
     public List<CodegenProperty> allVars = new ArrayList<>(); // all properties (with parent's properties)
@@ -856,6 +856,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 hasOnlyReadOnly == that.hasOnlyReadOnly &&
                 isNull == that.isNull &&
                 hasValidation == that.hasValidation &&
+                isDecimal == that.isDecimal &&
                 hasMultipleTypes == that.getHasMultipleTypes() &&
                 hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() &&
                 getIsAnyType() == that.getIsAnyType() &&
@@ -934,7 +935,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(),
                 getMaximum(), getPattern(), getMultipleOf(), getItems(), getAdditionalProperties(), getIsModel(),
                 getAdditionalPropertiesIsAnyType(), hasDiscriminatorWithNonEmptyMapping,
-                isAnyType, getComposedSchemas(), hasMultipleTypes);
+                isAnyType, getComposedSchemas(), hasMultipleTypes, isDecimal);
     }
 
     @Override
@@ -1028,6 +1029,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         sb.append(", getIsAnyType=").append(getIsAnyType());
         sb.append(", composedSchemas=").append(composedSchemas);
         sb.append(", hasMultipleTypes=").append(hasMultipleTypes);
+        sb.append(", isDecimal=").append(isDecimal);
         sb.append('}');
         return sb.toString();
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java

@@ -198,6 +198,7 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
 
         languageSpecificPrimitives.add("file_type");
         languageSpecificPrimitives.add("none_type");
+        typeMapping.put("decimal", "str");
 
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata)
                 .stability(Stability.EXPERIMENTAL)
@@ -510,6 +511,7 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
                 "- inline schemas are supported at any location including composition",
                 "- multiple content types supported in request body and response bodies",
                 "- run time type checking",
+                "- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema",
                 "- quicker load time for python modules (a single endpoint can be imported and used without loading others)",
                 "- all instances of schemas dynamically inherit from all matching schemas so one can use isinstance to check if validation passed",
                 "- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)",
@@ -1053,6 +1055,14 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
     @Override
     public CodegenModel fromModel(String name, Schema sc) {
         CodegenModel cm = super.fromModel(name, sc);
+        Schema unaliasedSchema = unaliasSchema(sc, importMapping);
+        if (unaliasedSchema != null) {
+            if (ModelUtils.isDecimalSchema(unaliasedSchema)) { // type: string, format: number
+                cm.isString = false;
+                cm.isDecimal = true;
+            }
+        }
+
         if (cm.isNullable) {
             cm.setIsNull(true);
             cm.isNullable = false;

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

@@ -25,7 +25,6 @@ from {{packageName}} import rest
 from {{packageName}}.configuration import Configuration
 from {{packageName}}.exceptions import ApiTypeError, ApiValueError
 from {{packageName}}.schemas import (
-    Decimal,
     NoneClass,
     BoolClass,
     Schema,

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

@@ -5,7 +5,7 @@
 import unittest
 
 import {{packageName}}
-from {{packageName}}.api.{{classFilename}} import {{classname}}  # noqa: E501
+from {{packageName}}.{{apiPackage}}.{{classFilename}} import {{classname}}  # noqa: E501
 
 
 class {{#with operations}}Test{{classname}}(unittest.TestCase):

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

@@ -1,4 +1,4 @@
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -16,6 +16,7 @@ from {{packageName}}.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -1,6 +1,6 @@
 def __new__(
     cls,
-    *args: typing.Union[{{#if isAnyType}}dict, frozendict, str, date, datetime, int, float, Decimal, None, list, tuple, bytes{{/if}}{{#if isUnboundedInteger}}int, {{/if}}{{#if isNumber}}float, {{/if}}{{#if isBoolean}}bool, {{/if}}{{#if isArray}}list, tuple, {{/if}}{{#if isMap}}dict, frozendict, {{/if}}{{#if isString}}str, {{/if}}{{#if isNull}}None, {{/if}}],
+    *args: typing.Union[{{#if isAnyType}}dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes{{/if}}{{#if isUnboundedInteger}}int, {{/if}}{{#if isNumber}}float, {{/if}}{{#if isBoolean}}bool, {{/if}}{{#if isArray}}list, tuple, {{/if}}{{#if isMap}}dict, frozendict, {{/if}}{{#if isString}}str, {{/if}}{{#if isNull}}None, {{/if}}],
 {{#unless isNull}}
 {{#if getHasRequired}}
 {{#each requiredVars}}
@@ -26,7 +26,7 @@ def __new__(
 {{#with additionalProperties}}
     **kwargs: typing.Type[Schema],
 {{/with}}
-):
+) -> '{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}':
     return super().__new__(
         cls,
         *args,

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

@@ -12,7 +12,7 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
     {{/if}}
 {{else}}
     {{#if getHasMultipleTypes}}
-    _SchemaTypeChecker(typing.Union[{{#if isArray}}tuple, {{/if}}{{#if isMap}}frozendict, {{/if}}{{#if isNull}}none_type, {{/if}}{{#if isString}}str, {{/if}}{{#if isByteArray}}str, {{/if}}{{#if isUnboundedInteger}}Decimal, {{/if}}{{#if isShort}}Decimal, {{/if}}{{#if isLong}}Decimal, {{/if}}{{#if isFloat}}Decimal, {{/if}}{{#if isDouble}}Decimal, {{/if}}{{#if isNumber}}Decimal, {{/if}}{{#if isDate}}str, {{/if}}{{#if isDateTime}}str, {{/if}}{{#if isBoolean}}bool, {{/if}}]),
+    _SchemaTypeChecker(typing.Union[{{#if isArray}}tuple, {{/if}}{{#if isMap}}frozendict, {{/if}}{{#if isNull}}none_type, {{/if}}{{#if isString}}str, {{/if}}{{#if isByteArray}}str, {{/if}}{{#if isUnboundedInteger}}decimal.Decimal, {{/if}}{{#if isShort}}decimal.Decimal, {{/if}}{{#if isLong}}decimal.Decimal, {{/if}}{{#if isFloat}}decimal.Decimal, {{/if}}{{#if isDouble}}decimal.Decimal, {{/if}}{{#if isNumber}}decimal.Decimal, {{/if}}{{#if isDate}}str, {{/if}}{{#if isDateTime}}str, {{/if}}{{#if isDecimal}}str, {{/if}}{{#if isBoolean}}bool, {{/if}}]),
     {{/if}}
     {{#if composedSchemas}}
     ComposedBase,

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

@@ -1 +1 @@
-{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#if complexType}}{{complexType}}{{else}}{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}Str{{/if}}{{#if isByteArray}}Str{{/if}}{{#if isUnboundedInteger}}Int{{/if}}{{#if isShort}}Int32{{/if}}{{#if isLong}}Int64{{/if}}{{#if isFloat}}Float32{{/if}}{{#if isDouble}}Float64{{/if}}{{#if isNumber}}Number{{/if}}{{#if isDate}}Date{{/if}}{{#if isDateTime}}DateTime{{/if}}{{#if isBoolean}}Bool{{/if}}{{#if isBinary}}Binary{{/if}}Schema{{/if}}
+{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#if complexType}}{{complexType}}{{else}}{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}Str{{/if}}{{#if isByteArray}}Str{{/if}}{{#if isDate}}Date{{/if}}{{#if isDateTime}}DateTime{{/if}}{{#if isDecimal}}Decimal{{/if}}{{#if isUnboundedInteger}}Int{{/if}}{{#if isShort}}Int32{{/if}}{{#if isLong}}Int64{{/if}}{{#if isFloat}}Float32{{/if}}{{#if isDouble}}Float64{{/if}}{{#if isNumber}}Number{{/if}}{{#if isBoolean}}Bool{{/if}}{{#if isBinary}}Binary{{/if}}Schema{{/if}}

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

@@ -34,6 +34,9 @@ Date{{#if getHasMultipleTypes}}Base,{{else}}Schema{{/if}}
 {{#if isDateTime}}
 DateTime{{#if getHasMultipleTypes}}Base,{{else}}Schema{{/if}}
 {{/if}}
+{{#if isDecimal}}
+Decimal{{#if getHasMultipleTypes}}Base,{{else}}Schema{{/if}}
+{{/if}}
 {{#if isBoolean}}
 Bool{{#if getHasMultipleTypes}}Base,{{else}}Schema{{/if}}
 {{/if}}

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

@@ -2,13 +2,12 @@
 
 {{>partial_header}}
 
-import sys
 import unittest
 
 import {{packageName}}
 {{#each models}}
 {{#with model}}
-from {{modelPackage}}.{{classFilename}} import {{classname}}
+from {{packageName}}.{{modelPackage}}.{{classFilename}} import {{classname}}
 
 
 class Test{{classname}}(unittest.TestCase):

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

@@ -6,7 +6,7 @@ from collections import defaultdict
 from datetime import date, datetime, timedelta  # noqa: F401
 from dataclasses import dataclass
 import functools
-from decimal import Decimal
+import decimal
 import io
 import os
 import re
@@ -256,7 +256,7 @@ class ValidatorBase:
                                       _instantiation_metadata.configuration) and 'multiple_of' in validations:
             multiple_of_values = validations['multiple_of']
             for multiple_of_value in multiple_of_values:
-                if (isinstance(input_values, Decimal) and
+                if (isinstance(input_values, decimal.Decimal) and
                         not (float(input_values) / multiple_of_value).is_integer()
                 ):
                     # Note 'multipleOf' will be as good as the floating point arithmetic.
@@ -327,7 +327,7 @@ class ValidatorBase:
             cls.__check_tuple_validations(validations, input_values, _instantiation_metadata)
         elif isinstance(input_values, frozendict):
             cls.__check_dict_validations(validations, input_values, _instantiation_metadata)
-        elif isinstance(input_values, Decimal):
+        elif isinstance(input_values, decimal.Decimal):
             cls.__check_numeric_validations(validations, input_values, _instantiation_metadata)
         try:
             return super()._validate_validations_pass(input_values, _instantiation_metadata)
@@ -424,7 +424,7 @@ class EnumMakerInterface(typing.Protocol):
     @property
     def _enum_value_to_name(
         cls
-    ) -> typing.Dict[typing.Union[str, Decimal, bool, none_type], str]:
+    ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
         pass
 
     @classmethod
@@ -435,13 +435,13 @@ class EnumMakerInterface(typing.Protocol):
         pass
 
 
-def _SchemaEnumMaker(enum_value_to_name: typing.Dict[typing.Union[str, Decimal, bool, none_type], str]) -> EnumMakerInterface:
+def _SchemaEnumMaker(enum_value_to_name: typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]) -> EnumMakerInterface:
     class SchemaEnumMaker(EnumMakerBase):
         @classmethod
         @property
         def _enum_value_to_name(
                 cls
-        ) -> typing.Dict[typing.Union[str, Decimal, bool, none_type], str]:
+        ) -> typing.Dict[typing.Union[str, decimal.Decimal, bool, none_type], str]:
             pass
             try:
                 super_enum_value_to_name = super()._enum_value_to_name
@@ -538,6 +538,10 @@ class StrBase:
     def as_datetime(self) -> datetime:
         raise Exception('not implemented')
 
+    @property
+    def as_decimal(self) -> decimal.Decimal:
+        raise Exception('not implemented')
+
 
 class CustomIsoparser(isoparser):
 
@@ -629,6 +633,39 @@ class DateTimeBase:
         return super()._validate(*args, _instantiation_metadata=_instantiation_metadata)
 
 
+class DecimalBase(StrBase):
+    """
+    A class for storing decimals that are sent over the wire as strings
+    These schemas must remain based on StrBase rather than NumberBase
+    because picking base classes must be deterministic
+    """
+
+    @property
+    @functools.cache
+    def as_decimal(self) -> decimal.Decimal:
+        return decimal.Decimal(self)
+
+    @classmethod
+    def _validate_format(cls, arg: typing.Optional[str], _instantiation_metadata: InstantiationMetadata):
+        if isinstance(arg, str):
+            try:
+                decimal.Decimal(arg)
+                return True
+            except decimal.InvalidOperation:
+                raise ApiValueError(
+                    "Value cannot be converted to a decimal. "
+                    "Invalid value '{}' for type decimal at {}".format(arg, _instantiation_metadata.path_to_item)
+                )
+
+    @classmethod
+    def _validate(cls, *args, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
+        """
+        DecimalBase _validate
+        """
+        cls._validate_format(args[0], _instantiation_metadata=_instantiation_metadata)
+        return super()._validate(*args, _instantiation_metadata=_instantiation_metadata)
+
+
 class NumberBase:
     @property
     def as_int(self) -> int:
@@ -1038,7 +1075,7 @@ class DictBase(Discriminable):
             return super().__getattribute__(name)
 
 
-inheritable_primitive_types_set = {Decimal, str, tuple, frozendict, FileIO, bytes}
+inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict, FileIO, bytes}
 
 
 class Schema:
@@ -1145,8 +1182,8 @@ class Schema:
             new_cls = get_new_class(cls_name, (cls, BoolBase, BoolClass))
         elif base_cls is str:
             new_cls = get_new_class(cls_name, (cls, StrBase, str))
-        elif base_cls is Decimal:
-            new_cls = get_new_class(cls_name, (cls, NumberBase, Decimal))
+        elif base_cls is decimal.Decimal:
+            new_cls = get_new_class(cls_name, (cls, NumberBase, decimal.Decimal))
         elif base_cls is tuple:
             new_cls =  get_new_class(cls_name, (cls, ListBase, tuple))
         elif base_cls is frozendict:
@@ -1168,7 +1205,7 @@ class Schema:
         - the returned instance is a serializable type (except for None, True, and False) which are enums
 
         Use cases:
-        1. inheritable type: string/Decimal/frozendict/tuple
+        1. inheritable type: string/decimal.Decimal/frozendict/tuple
         2. enum value cases: 'hi', 1 -> no base_class set because the enum includes the base class
         3. uninheritable type: True/False/None -> no base_class because the base class is not inheritable
             _enum_by_value will handle this use case
@@ -1308,7 +1345,7 @@ class Schema:
             return super(Schema, cls).__new__(cls, properties)
         """
         str = openapi str, date, and datetime
-        Decimal = openapi int and float
+        decimal.Decimal = openapi int and float
         FileIO = openapi binary type and the user inputs a file
         bytes = openapi binary type and the user inputs bytes
         """
@@ -1323,7 +1360,7 @@ class Schema:
             datetime,
             int,
             float,
-            Decimal,
+            decimal.Decimal,
             bool,
             None,
             'Schema',
@@ -1360,13 +1397,13 @@ class Schema:
     def __remove_unsets(kwargs):
         return {key: val for key, val in kwargs.items() if val is not unset}
 
-    def __new__(cls, *args: typing.Union[dict, frozendict, list, tuple, Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, **kwargs: typing.Union[dict, frozendict, list, tuple, Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
+    def __new__(cls, *args: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None, **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset]):
         """
         Schema __new__
 
         Args:
-            args (int/float/Decimal/str/list/tuple/dict/frozendict/bool/None): the value
-            kwargs (str, int/float/Decimal/str/list/tuple/dict/frozendict/bool/None): dict values
+            args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict/bool/None): the value
+            kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict/bool/None): dict values
             _instantiation_metadata: contains the needed from_server, configuration, path_to_item
         """
         kwargs = cls.__remove_unsets(kwargs)
@@ -1390,10 +1427,10 @@ class Schema:
     def __init__(
         self,
         *args: typing.Union[
-            dict, frozendict, list, tuple, Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
+            dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Union[
-            dict, frozendict, list, tuple, Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
+            dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
         ]
     ):
         """
@@ -1405,7 +1442,7 @@ class Schema:
         pass
 
 
-def cast_to_allowed_types(arg: typing.Union[str, date, datetime, int, float, None, dict, frozendict, list, tuple, bytes, Schema], from_server=False) -> typing.Union[str, bytes, int, float, None, frozendict, tuple, Schema]:
+def cast_to_allowed_types(arg: typing.Union[str, date, datetime, decimal.Decimal, int, float, None, dict, frozendict, list, tuple, bytes, Schema], from_server=False) -> typing.Union[str, bytes, decimal.Decimal, None, frozendict, tuple, Schema]:
     """
     from_server=False date, datetime -> str
     int, float -> Decimal
@@ -1422,16 +1459,16 @@ def cast_to_allowed_types(arg: typing.Union[str, date, datetime, int, float, Non
         because isinstance(True, int) is True
         """
         return arg
-    elif isinstance(arg, Decimal):
+    elif isinstance(arg, decimal.Decimal):
         return arg
     elif isinstance(arg, int):
-        return Decimal(arg)
+        return decimal.Decimal(arg)
     elif isinstance(arg, float):
-        decimal_from_float = Decimal(arg)
+        decimal_from_float = decimal.Decimal(arg)
         if decimal_from_float.as_integer_ratio()[1] == 1:
             # 9.0 -> Decimal('9.0')
             # 3.4028234663852886e+38 -> Decimal('340282346638528859811704183484516925440.0')
-            return Decimal(str(decimal_from_float)+'.0')
+            return decimal.Decimal(str(decimal_from_float)+'.0')
         return decimal_from_float
     elif isinstance(arg, str):
         return arg
@@ -1628,7 +1665,7 @@ class ComposedBase(Discriminable):
 
 # DictBase, ListBase, NumberBase, StrBase, BoolBase, NoneBase
 class ComposedSchema(
-    _SchemaTypeChecker(typing.Union[none_type, str, Decimal, bool, tuple, frozendict]),
+    _SchemaTypeChecker(typing.Union[none_type, str, decimal.Decimal, bool, tuple, frozendict]),
     ComposedBase,
     DictBase,
     ListBase,
@@ -1680,7 +1717,7 @@ class NoneSchema(
 
 
 class NumberSchema(
-    _SchemaTypeChecker(typing.Union[Decimal]),
+    _SchemaTypeChecker(typing.Union[decimal.Decimal]),
     NumberBase,
     Schema
 ):
@@ -1690,10 +1727,10 @@ class NumberSchema(
     """
 
     @classmethod
-    def _from_openapi_data(cls, arg: typing.Union[int, float, Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
+    def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
         return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata)
 
-    def __new__(cls, arg: typing.Union[Decimal, int, float], **kwargs: typing.Union[InstantiationMetadata]):
+    def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[InstantiationMetadata]):
         return super().__new__(cls, arg, **kwargs)
 
 
@@ -1707,8 +1744,8 @@ class IntBase(NumberBase):
             return self._as_int
 
     @classmethod
-    def _validate_format(cls, arg: typing.Optional[Decimal], _instantiation_metadata: InstantiationMetadata):
-        if isinstance(arg, Decimal):
+    def _validate_format(cls, arg: typing.Optional[decimal.Decimal], _instantiation_metadata: InstantiationMetadata):
+        if isinstance(arg, decimal.Decimal):
             exponent = arg.as_tuple().exponent
             if exponent != 0:
                 raise ApiValueError(
@@ -1731,14 +1768,14 @@ class IntSchema(IntBase, NumberSchema):
     def _from_openapi_data(cls, arg: int, _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
         return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata)
 
-    def __new__(cls, arg: typing.Union[Decimal, int], **kwargs: typing.Union[InstantiationMetadata]):
+    def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[InstantiationMetadata]):
         return super().__new__(cls, arg, **kwargs)
 
 
 class Int32Schema(
     _SchemaValidator(
-        inclusive_minimum=Decimal(-2147483648),
-        inclusive_maximum=Decimal(2147483647)
+        inclusive_minimum=decimal.Decimal(-2147483648),
+        inclusive_maximum=decimal.Decimal(2147483647)
     ),
     IntSchema
 ):
@@ -1746,8 +1783,8 @@ class Int32Schema(
 
 class Int64Schema(
     _SchemaValidator(
-        inclusive_minimum=Decimal(-9223372036854775808),
-        inclusive_maximum=Decimal(9223372036854775807)
+        inclusive_minimum=decimal.Decimal(-9223372036854775808),
+        inclusive_maximum=decimal.Decimal(9223372036854775807)
     ),
     IntSchema
 ):
@@ -1756,28 +1793,28 @@ class Int64Schema(
 
 class Float32Schema(
     _SchemaValidator(
-        inclusive_minimum=Decimal(-3.4028234663852886e+38),
-        inclusive_maximum=Decimal(3.4028234663852886e+38)
+        inclusive_minimum=decimal.Decimal(-3.4028234663852886e+38),
+        inclusive_maximum=decimal.Decimal(3.4028234663852886e+38)
     ),
     NumberSchema
 ):
 
     @classmethod
-    def _from_openapi_data(cls, arg: typing.Union[float, Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
+    def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
         # todo check format
         return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata)
 
 
 class Float64Schema(
     _SchemaValidator(
-        inclusive_minimum=Decimal(-1.7976931348623157E+308),
-        inclusive_maximum=Decimal(1.7976931348623157E+308)
+        inclusive_minimum=decimal.Decimal(-1.7976931348623157E+308),
+        inclusive_maximum=decimal.Decimal(1.7976931348623157E+308)
     ),
     NumberSchema
 ):
 
     @classmethod
-    def _from_openapi_data(cls, arg: typing.Union[float, Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
+    def _from_openapi_data(cls, arg: typing.Union[float, decimal.Decimal], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
         # todo check format
         return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata)
 
@@ -1814,6 +1851,20 @@ class DateTimeSchema(DateTimeBase, StrSchema):
         return super().__new__(cls, arg, **kwargs)
 
 
+class DecimalSchema(DecimalBase, StrSchema):
+
+    def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[InstantiationMetadata]):
+        """
+        Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
+        which can be simple (str) or complex (dicts or lists with nested values)
+        Because casting is only done once and recursively casts all values prior to validation then for a potential
+        client side Decimal input if Decimal was accepted as an input in DecimalSchema then one would not know
+        if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
+        where it should stay as Decimal.
+        """
+        return super().__new__(cls, arg, **kwargs)
+
+
 class BytesSchema(
     _SchemaTypeChecker(typing.Union[bytes]),
     Schema,
@@ -1901,7 +1952,7 @@ class BoolSchema(
 
 class AnyTypeSchema(
     _SchemaTypeChecker(
-        typing.Union[frozendict, tuple, Decimal, str, bool, none_type, bytes, FileIO]
+        typing.Union[frozendict, tuple, decimal.Decimal, str, bool, none_type, bytes, FileIO]
     ),
     DictBase,
     ListBase,
@@ -1924,7 +1975,7 @@ class DictSchema(
     def _from_openapi_data(cls, arg: typing.Dict[str, typing.Any], _instantiation_metadata: typing.Optional[InstantiationMetadata] = None):
         return super()._from_openapi_data(arg, _instantiation_metadata=_instantiation_metadata)
 
-    def __new__(cls, *args: typing.Union[dict, frozendict], **kwargs: typing.Union[dict, frozendict, list, tuple, Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, InstantiationMetadata]):
+    def __new__(cls, *args: typing.Union[dict, frozendict], **kwargs: typing.Union[dict, frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, InstantiationMetadata]):
         return super().__new__(cls, *args, **kwargs)
 
 

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

@@ -2653,3 +2653,32 @@ components:
       type: 'null'
       allOf:
         - {}
+    Currency:
+      type: string
+      enum:
+        - eur
+        - usd
+    Money:
+      type: object
+      properties:
+        amount:
+          type: string
+          format: number
+        currency:
+          $ref: '#/components/schemas/Currency'
+      required:
+        - amount
+        - currency
+    DecimalPayload:
+      type: string
+      format: number
+    ObjectWithDecimalProperties:
+      type: object
+      properties:
+        length:
+          $ref: '#/components/schemas/DecimalPayload'
+        width:
+          type: string
+          format: number
+        cost:
+          $ref: '#/components/schemas/Money'

samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES

@@ -41,10 +41,12 @@ docs/ComposedNumber.md
 docs/ComposedObject.md
 docs/ComposedOneOfDifferentTypes.md
 docs/ComposedString.md
+docs/Currency.md
 docs/DanishPig.md
 docs/DateTimeTest.md
 docs/DateTimeWithValidations.md
 docs/DateWithValidations.md
+docs/DecimalPayload.md
 docs/DefaultApi.md
 docs/Dog.md
 docs/DogAllOf.md
@@ -80,6 +82,7 @@ docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
 docs/ModelReturn.md
+docs/Money.md
 docs/Name.md
 docs/NoAdditionalProperties.md
 docs/NullableClass.md
@@ -90,6 +93,7 @@ docs/NumberOnly.md
 docs/NumberWithValidations.md
 docs/ObjectInterface.md
 docs/ObjectModelWithRefProps.md
+docs/ObjectWithDecimalProperties.md
 docs/ObjectWithDifficultlyNamedProps.md
 docs/ObjectWithValidations.md
 docs/Order.md
@@ -175,10 +179,12 @@ petstore_api/model/composed_number.py
 petstore_api/model/composed_object.py
 petstore_api/model/composed_one_of_different_types.py
 petstore_api/model/composed_string.py
+petstore_api/model/currency.py
 petstore_api/model/danish_pig.py
 petstore_api/model/date_time_test.py
 petstore_api/model/date_time_with_validations.py
 petstore_api/model/date_with_validations.py
+petstore_api/model/decimal_payload.py
 petstore_api/model/dog.py
 petstore_api/model/dog_all_of.py
 petstore_api/model/drawing.py
@@ -211,6 +217,7 @@ petstore_api/model/map_test.py
 petstore_api/model/mixed_properties_and_additional_properties_class.py
 petstore_api/model/model200_response.py
 petstore_api/model/model_return.py
+petstore_api/model/money.py
 petstore_api/model/name.py
 petstore_api/model/no_additional_properties.py
 petstore_api/model/nullable_class.py
@@ -221,6 +228,7 @@ petstore_api/model/number_only.py
 petstore_api/model/number_with_validations.py
 petstore_api/model/object_interface.py
 petstore_api/model/object_model_with_ref_props.py
+petstore_api/model/object_with_decimal_properties.py
 petstore_api/model/object_with_difficultly_named_props.py
 petstore_api/model/object_with_validations.py
 petstore_api/model/order.py

samples/openapi3/client/petstore/python-experimental/README.md

@@ -172,10 +172,12 @@ Class | Method | HTTP request | Description
  - [ComposedObject](docs/ComposedObject.md)
  - [ComposedOneOfDifferentTypes](docs/ComposedOneOfDifferentTypes.md)
  - [ComposedString](docs/ComposedString.md)
+ - [Currency](docs/Currency.md)
  - [DanishPig](docs/DanishPig.md)
  - [DateTimeTest](docs/DateTimeTest.md)
  - [DateTimeWithValidations](docs/DateTimeWithValidations.md)
  - [DateWithValidations](docs/DateWithValidations.md)
+ - [DecimalPayload](docs/DecimalPayload.md)
  - [Dog](docs/Dog.md)
  - [DogAllOf](docs/DogAllOf.md)
  - [Drawing](docs/Drawing.md)
@@ -208,6 +210,7 @@ Class | Method | HTTP request | Description
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [ModelReturn](docs/ModelReturn.md)
+ - [Money](docs/Money.md)
  - [Name](docs/Name.md)
  - [NoAdditionalProperties](docs/NoAdditionalProperties.md)
  - [NullableClass](docs/NullableClass.md)
@@ -218,6 +221,7 @@ Class | Method | HTTP request | Description
  - [NumberWithValidations](docs/NumberWithValidations.md)
  - [ObjectInterface](docs/ObjectInterface.md)
  - [ObjectModelWithRefProps](docs/ObjectModelWithRefProps.md)
+ - [ObjectWithDecimalProperties](docs/ObjectWithDecimalProperties.md)
  - [ObjectWithDifficultlyNamedProps](docs/ObjectWithDifficultlyNamedProps.md)
  - [ObjectWithValidations](docs/ObjectWithValidations.md)
  - [Order](docs/Order.md)

samples/openapi3/client/petstore/python-experimental/docs/Currency.md

@@ -0,0 +1,8 @@
+# Currency
+
+Type | Description | Notes
+------------- | ------------- | -------------
+**str** |  |  must be one of ["eur", "usd", ]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/openapi3/client/petstore/python-experimental/docs/DecimalPayload.md

@@ -0,0 +1,8 @@
+# DecimalPayload
+
+Type | Description | Notes
+------------- | ------------- | -------------
+**str** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/openapi3/client/petstore/python-experimental/docs/Money.md

@@ -0,0 +1,11 @@
+# Money
+
+#### Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**amount** | **str** |  | 
+**currency** | [**Currency**](Currency.md) |  | 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/openapi3/client/petstore/python-experimental/docs/ObjectWithDecimalProperties.md

@@ -0,0 +1,12 @@
+# ObjectWithDecimalProperties
+
+#### Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**length** | **str** |  | [optional] 
+**width** | **str** |  | [optional] 
+**cost** | [**Money**](Money.md) |  | [optional] 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api_endpoints/call_123_test_special_tags.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/array_model.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_file_schema.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/body_with_query_params.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/boolean.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/case_sensitive_params.py

@@ -13,7 +13,7 @@ import typing
 import urllib3
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -31,6 +31,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/client_model.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/composed_one_of_different_types.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -172,7 +173,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         callback: typing.Union[callback, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -348,7 +349,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string: typing.Union[enum_form_string, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/fake_health_get.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/group_parameters.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_additional_properties.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -70,7 +71,7 @@ class SchemaForRequestBodyApplicationJson(
         *args: typing.Union[dict, frozendict, ],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -73,7 +74,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         *args: typing.Union[dict, frozendict, ],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/mammal.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/number_with_validations.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_model_with_ref_props.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/parameter_collisions.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py

@@ -13,7 +13,7 @@ import typing
 import urllib3
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -31,6 +31,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/string_enum.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_download_file.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -76,7 +77,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[additionalMetadata, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -78,7 +79,7 @@ class SchemaForRequestBodyMultipartFormData(
         files: typing.Union[files, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api_endpoints/classname.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/add_pet.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/delete_pet.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_status.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/find_pets_by_tags.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/get_pet_by_id.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -99,7 +100,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         status: typing.Union[status, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -102,7 +103,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[additionalMetadata, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -100,7 +101,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[additionalMetadata, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/delete_order.py

@@ -13,7 +13,7 @@ import typing
 import urllib3
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -31,6 +31,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_inventory.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -74,7 +75,7 @@ class SchemaFor200ResponseBodyApplicationJson(
         *args: typing.Union[dict, frozendict, ],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/get_order_by_id.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api_endpoints/place_order.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_user.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_array_input.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/create_users_with_list_input.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/delete_user.py

@@ -13,7 +13,7 @@ import typing
 import urllib3
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -31,6 +31,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/get_user_by_name.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/login_user.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/logout_user.py

@@ -13,7 +13,7 @@ import typing
 import urllib3
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -31,6 +31,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api_endpoints/update_user.py

@@ -14,7 +14,7 @@ import urllib3
 from urllib3._collections import HTTPHeaderDict
 
 from petstore_api import api_client, exceptions
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -32,6 +32,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -29,7 +29,6 @@ from petstore_api import rest
 from petstore_api.configuration import Configuration
 from petstore_api.exceptions import ApiTypeError, ApiValueError
 from petstore_api.schemas import (
-    Decimal,
     NoneClass,
     BoolClass,
     Schema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -79,7 +80,7 @@ class AdditionalPropertiesClass(
             *args: typing.Union[dict, frozendict, ],
             _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
             **kwargs: typing.Type[Schema],
-        ):
+        ) -> 'map_property':
             return super().__new__(
                 cls,
                 *args,
@@ -104,7 +105,7 @@ class AdditionalPropertiesClass(
                 *args: typing.Union[dict, frozendict, ],
                 _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
                 **kwargs: typing.Type[Schema],
-            ):
+            ) -> '_additional_properties':
                 return super().__new__(
                     cls,
                     *args,
@@ -118,7 +119,7 @@ class AdditionalPropertiesClass(
             *args: typing.Union[dict, frozendict, ],
             _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
             **kwargs: typing.Type[Schema],
-        ):
+        ) -> 'map_of_map_property':
             return super().__new__(
                 cls,
                 *args,
@@ -141,7 +142,7 @@ class AdditionalPropertiesClass(
             cls,
             *args: typing.Union[dict, frozendict, ],
             _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
-        ):
+        ) -> 'empty_map':
             return super().__new__(
                 cls,
                 *args,
@@ -160,7 +161,7 @@ class AdditionalPropertiesClass(
             *args: typing.Union[dict, frozendict, ],
             _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
             **kwargs: typing.Type[Schema],
-        ):
+        ) -> 'map_with_undeclared_properties_string':
             return super().__new__(
                 cls,
                 *args,
@@ -182,7 +183,7 @@ class AdditionalPropertiesClass(
         map_with_undeclared_properties_string: typing.Union[map_with_undeclared_properties_string, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -83,7 +84,7 @@ class AdditionalPropertiesWithArrayOfEnums(
         *args: typing.Union[dict, frozendict, ],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'AdditionalPropertiesWithArrayOfEnums':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -74,7 +75,7 @@ class Address(
         *args: typing.Union[dict, frozendict, ],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Address':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -90,7 +91,7 @@ class Animal(
         color: typing.Union[color, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Animal':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -79,7 +80,7 @@ class ApiResponse(
         message: typing.Union[message, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ApiResponse':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -104,7 +105,7 @@ class Apple(
         origin: typing.Union[origin, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Apple':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -80,7 +81,7 @@ class AppleReq(
         cultivar: cultivar,
         mealy: typing.Union[mealy, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
-    ):
+    ) -> 'AppleReq':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -85,7 +86,7 @@ class ArrayOfArrayOfNumberOnly(
         ArrayArrayNumber: typing.Union[ArrayArrayNumber, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -80,7 +81,7 @@ class ArrayOfNumberOnly(
         ArrayNumber: typing.Union[ArrayNumber, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -108,7 +109,7 @@ class ArrayTest(
         array_array_of_model: typing.Union[array_array_of_model, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ArrayTest':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -78,7 +79,7 @@ class Banana(
         lengthCm: lengthCm,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Banana':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -80,7 +81,7 @@ class BananaReq(
         lengthCm: lengthCm,
         sweet: typing.Union[sweet, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
-    ):
+    ) -> 'BananaReq':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -92,7 +93,7 @@ class BasquePig(
         className: className,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'BasquePig':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -85,7 +86,7 @@ class Capitalization(
         ATT_NAME: typing.Union[ATT_NAME, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Capitalization':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -90,10 +91,10 @@ class Cat(
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, Decimal, None, list, tuple, bytes],
+        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Cat':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -75,7 +76,7 @@ class CatAllOf(
         declawed: typing.Union[declawed, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'CatAllOf':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -80,7 +81,7 @@ class Category(
         id: typing.Union[id, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Category':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -90,10 +91,10 @@ class ChildCat(
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, Decimal, None, list, tuple, bytes],
+        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ChildCat':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -75,7 +76,7 @@ class ChildCatAllOf(
         name: typing.Union[name, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ChildCatAllOf':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -72,11 +73,11 @@ class ClassModel(
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, Decimal, None, list, tuple, bytes],
+        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes],
         _class: typing.Union[_class, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ClassModel':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -75,7 +76,7 @@ class Client(
         client: typing.Union[client, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'Client':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -90,10 +91,10 @@ class ComplexQuadrilateral(
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, Decimal, None, list, tuple, bytes],
+        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -89,7 +90,7 @@ class ComplexQuadrilateralAllOf(
         quadrilateralType: typing.Union[quadrilateralType, Unset] = unset,
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ComplexQuadrilateralAllOf':
         return super().__new__(
             cls,
             *args,

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

@@ -15,7 +15,7 @@ import typing  # noqa: F401
 
 from frozendict import frozendict  # noqa: F401
 
-from decimal import Decimal  # noqa: F401
+import decimal  # noqa: F401
 from datetime import date, datetime  # noqa: F401
 from frozendict import frozendict  # noqa: F401
 
@@ -33,6 +33,7 @@ from petstore_api.schemas import (  # noqa: F401
     NumberSchema,
     DateSchema,
     DateTimeSchema,
+    DecimalSchema,
     BoolSchema,
     BinarySchema,
     NoneSchema,
@@ -125,10 +126,10 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
     def __new__(
         cls,
-        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, Decimal, None, list, tuple, bytes],
+        *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes],
         _instantiation_metadata: typing.Optional[InstantiationMetadata] = None,
         **kwargs: typing.Type[Schema],
-    ):
+    ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
             *args,