diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index 127c699f228..68603130e24 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -111,6 +111,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { private CodegenComposedSchemas composedSchemas; private boolean hasMultipleTypes = false; public HashMap testCases = new HashMap<>(); + private boolean schemaIsFromAdditionalProperties; /** * The type of the value for the additionalProperties keyword in the OAS document. @@ -186,6 +187,16 @@ public class CodegenModel implements IJsonSchemaValidationProperties { this.ref = ref; } + @Override + public boolean getSchemaIsFromAdditionalProperties() { + return schemaIsFromAdditionalProperties; + } + + @Override + public void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalProperties) { + this.schemaIsFromAdditionalProperties = schemaIsFromAdditionalProperties; + } + public Set getAllMandatory() { return allMandatory; } @@ -946,6 +957,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { hasMultipleTypes == that.getHasMultipleTypes() && hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() && isUuid == that.getIsUuid() && + getSchemaIsFromAdditionalProperties() == that.getSchemaIsFromAdditionalProperties() && getIsAnyType() == that.getIsAnyType() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getUniqueItems() == that.getUniqueItems() && @@ -1027,7 +1039,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { getMaximum(), getPattern(), getMultipleOf(), getItems(), getAdditionalProperties(), getIsModel(), getAdditionalPropertiesIsAnyType(), hasDiscriminatorWithNonEmptyMapping, isAnyType, getComposedSchemas(), hasMultipleTypes, isDecimal, isUuid, requiredVarsMap, ref, - uniqueItemsBoolean); + uniqueItemsBoolean, schemaIsFromAdditionalProperties); } @Override @@ -1127,6 +1139,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { sb.append(", isUUID=").append(isUuid); sb.append(", requiredVarsMap=").append(requiredVarsMap); sb.append(", ref=").append(ref); + sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties); sb.append('}'); return sb.toString(); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index 0900f52fd49..25f9295e7b2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -115,6 +115,8 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { private Map requiredVarsMap; private String ref; + private boolean schemaIsFromAdditionalProperties; + public CodegenParameter copy() { CodegenParameter output = new CodegenParameter(); output.isFile = this.isFile; @@ -167,6 +169,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { output.setHasRequired(this.hasRequired); output.setHasDiscriminatorWithNonEmptyMapping(this.hasDiscriminatorWithNonEmptyMapping); output.setHasMultipleTypes(this.hasMultipleTypes); + output.setSchemaIsFromAdditionalProperties(this.schemaIsFromAdditionalProperties); if (this.content != null) { output.setContent(this.content); @@ -240,7 +243,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, schema, content, requiredVarsMap, ref, uniqueItemsBoolean); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, isDeprecated, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, isShort, isUnboundedInteger, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, schema, content, requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties); } @Override @@ -291,6 +294,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && hasMultipleTypes == that.getHasMultipleTypes() && + getSchemaIsFromAdditionalProperties() == that.getSchemaIsFromAdditionalProperties() && getHasVars() == that.getHasVars() && getHasRequired() == that.getHasRequired() && getExclusiveMaximum() == that.getExclusiveMaximum() && @@ -431,6 +435,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", content=").append(content); sb.append(", requiredVarsMap=").append(requiredVarsMap); sb.append(", ref=").append(ref); + sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties); sb.append('}'); return sb.toString(); } @@ -853,5 +858,15 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { @Override public void setRef(String ref) { this.ref=ref; } + + @Override + public boolean getSchemaIsFromAdditionalProperties() { + return schemaIsFromAdditionalProperties; + } + + @Override + public void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalProperties) { + this.schemaIsFromAdditionalProperties = schemaIsFromAdditionalProperties; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 95b8994f5a6..63681c93593 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -197,6 +197,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti private boolean hasMultipleTypes = false; private Map requiredVarsMap; private String ref; + private boolean schemaIsFromAdditionalProperties; public String getBaseName() { return baseName; @@ -344,6 +345,16 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti this.unescapedDescription = unescapedDescription; } + @Override + public boolean getSchemaIsFromAdditionalProperties() { + return schemaIsFromAdditionalProperties; + } + + @Override + public void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalProperties) { + this.schemaIsFromAdditionalProperties = schemaIsFromAdditionalProperties; + } + @Override public Integer getMaxLength() { return maxLength; @@ -1004,6 +1015,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", hasMultipleTypes=").append(hasMultipleTypes); sb.append(", requiredVarsMap=").append(requiredVarsMap); sb.append(", ref=").append(ref); + sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties); sb.append('}'); return sb.toString(); } @@ -1059,6 +1071,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isNull == that.isNull && hasMultipleTypes == that.getHasMultipleTypes() && hasDiscriminatorWithNonEmptyMapping == that.hasDiscriminatorWithNonEmptyMapping && + getSchemaIsFromAdditionalProperties() == that.getSchemaIsFromAdditionalProperties() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getHasVars() == that.getHasVars() && getHasRequired() == that.getHasRequired() && @@ -1129,6 +1142,6 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, requiredVarsMap, - ref, uniqueItemsBoolean); + ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index 50046a6138c..6664334a0df 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -92,6 +92,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { private LinkedHashMap content; private Map requiredVarsMap; private String ref; + private boolean schemaIsFromAdditionalProperties; @Override public int hashCode() { @@ -104,7 +105,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern(), is1xx, is2xx, is3xx, is4xx, is5xx, additionalPropertiesIsAnyType, hasVars, hasRequired, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, responseHeaders, content, - requiredVarsMap, ref,uniqueItemsBoolean); + requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties); } @Override @@ -150,6 +151,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { is5xx == that.is5xx && hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() && hasMultipleTypes == that.getHasMultipleTypes() && + getSchemaIsFromAdditionalProperties() == that.getSchemaIsFromAdditionalProperties() && getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() && getHasVars() == that.getHasVars() && getHasRequired() == that.getHasRequired() && @@ -559,6 +561,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { sb.append(", content=").append(content); sb.append(", requiredVarsMap=").append(requiredVarsMap); sb.append(", ref=").append(ref); + sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties); sb.append('}'); return sb.toString(); } @@ -698,4 +701,14 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { @Override public void setRef(String ref) { this.ref=ref; } + + @Override + public boolean getSchemaIsFromAdditionalProperties() { + return schemaIsFromAdditionalProperties; + } + + @Override + public void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalProperties) { + this.schemaIsFromAdditionalProperties = schemaIsFromAdditionalProperties; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index fadedc565d7..490ec670d6f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2470,15 +2470,17 @@ public class DefaultCodegen implements CodegenConfig { } private static class NamedSchema { - private NamedSchema(String name, Schema s, boolean required) { + private NamedSchema(String name, Schema s, boolean required, boolean schemaIsFromAdditionalProperties) { this.name = name; this.schema = s; this.required = required; + this.schemaIsFromAdditionalProperties = schemaIsFromAdditionalProperties; } private String name; private Schema schema; private boolean required; + private boolean schemaIsFromAdditionalProperties; @Override public boolean equals(Object o) { @@ -2487,12 +2489,13 @@ public class DefaultCodegen implements CodegenConfig { NamedSchema that = (NamedSchema) o; return Objects.equals(required, that.required) && Objects.equals(name, that.name) && - Objects.equals(schema, that.schema); + Objects.equals(schema, that.schema) && + Objects.equals(schemaIsFromAdditionalProperties, that.schemaIsFromAdditionalProperties); } @Override public int hashCode() { - return Objects.hash(name, schema, required); + return Objects.hash(name, schema, required, schemaIsFromAdditionalProperties); } } @@ -3563,6 +3566,21 @@ public class DefaultCodegen implements CodegenConfig { property.pattern = toRegularExpression(p.getPattern()); } + /** + * TODO remove this in 7.0.0 as a breaking change + * This method was kept when required was added to the fromProperty signature + * to ensure that the change was non-breaking + * + * @param name name of the property + * @param p OAS property schema + * @param required true if the property is required in the next higher object schema, false otherwise + * @return Codegen Property object + */ + public CodegenProperty fromProperty(String name, Schema p, boolean required) { + return fromProperty(name, p, required, false); + } + + /** * TODO remove this in 7.0.0 as a breaking change * This method was kept when required was added to the fromProperty signature @@ -3573,7 +3591,7 @@ public class DefaultCodegen implements CodegenConfig { * @return Codegen Property object */ public CodegenProperty fromProperty(String name, Schema p) { - return fromProperty(name, p, false); + return fromProperty(name, p, false, false); } /** @@ -3588,15 +3606,16 @@ public class DefaultCodegen implements CodegenConfig { * @param name name of the property * @param p OAS property schema * @param required true if the property is required in the next higher object schema, false otherwise + * @param schemaIsFromAdditionalProperties true if the property is defined by additional properties schema * @return Codegen Property object */ - public CodegenProperty fromProperty(String name, Schema p, boolean required) { + public CodegenProperty fromProperty(String name, Schema p, boolean required, boolean schemaIsFromAdditionalProperties) { if (p == null) { LOGGER.error("Undefined property/schema for `{}`. Default to type:string.", name); return null; } LOGGER.debug("debugging fromProperty for {} : {}", name, p); - NamedSchema ns = new NamedSchema(name, p, required); + NamedSchema ns = new NamedSchema(name, p, required, schemaIsFromAdditionalProperties); CodegenProperty cpc = schemaCodegenPropertyCache.get(ns); if (cpc != null) { LOGGER.debug("Cached fromProperty for {} : {} required={}", name, p.getName(), required); @@ -3606,6 +3625,7 @@ public class DefaultCodegen implements CodegenConfig { p = unaliasSchema(p); CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY); + property.setSchemaIsFromAdditionalProperties(schemaIsFromAdditionalProperties); property.required = required; ModelUtils.syncValidationProperties(p, property); @@ -7220,6 +7240,7 @@ public class DefaultCodegen implements CodegenConfig { if (cp.baseName.equals(requiredPropertyName)) { found = true; requiredVarsMap.put(requiredPropertyName, cp); + break; } } if (found == false) { @@ -7238,12 +7259,14 @@ public class DefaultCodegen implements CodegenConfig { } CodegenProperty cp; if (schema.getAdditionalProperties() == null) { - cp = fromProperty(usedRequiredPropertyName, new Schema(), true); + // additionalProperties is null + cp = fromProperty(usedRequiredPropertyName, new Schema(), true, true); } else if (schema.getAdditionalProperties() instanceof Boolean && Boolean.TRUE.equals(schema.getAdditionalProperties())) { - cp = fromProperty(requiredPropertyName, new Schema(), true); + // additionalProperties is True + cp = fromProperty(requiredPropertyName, new Schema(), true, true); } else { - CodegenProperty addPropsProp = property.getAdditionalProperties(); - cp = addPropsProp; + // additionalProperties is schema + cp = fromProperty(requiredPropertyName, (Schema) schema.getAdditionalProperties(), true, true); } requiredVarsMap.put(usedRequiredPropertyName, cp); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index a3514fd850a..b4d37bf4ebd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -188,6 +188,10 @@ public interface IJsonSchemaValidationProperties { void setHasMultipleTypes(boolean hasMultipleTypes); + boolean getSchemaIsFromAdditionalProperties(); + + void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalProperties); + /** * Syncs all the schema's type properties into the IJsonSchemaValidationProperties instance * for now this only supports types without format information diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java index 14dadbfaf71..d5dee91e86c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java @@ -989,12 +989,14 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen { * This method is used by fromResponse * * @param name name of the property - * @param p OAS property object + * @param p OAS property schema + * @param required true if the property is required in the next higher object schema, false otherwise + * @param schemaIsFromAdditionalProperties true if the property is defined by additional properties schema * @return Codegen Property object */ @Override - public CodegenProperty fromProperty(String name, Schema p, boolean required) { - CodegenProperty cp = super.fromProperty(name, p, required); + public CodegenProperty fromProperty(String name, Schema p, boolean required, boolean schemaIsFromAdditionalProperties) { + CodegenProperty cp = super.fromProperty(name, p, required, schemaIsFromAdditionalProperties); if (cp.isAnyType && cp.isNullable) { cp.isNullable = false; diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/classname.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/classname.handlebars new file mode 100644 index 00000000000..fbde863faed --- /dev/null +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/classname.handlebars @@ -0,0 +1 @@ +{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars index aaa6c35b333..015c07b9a70 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/new.handlebars @@ -1,6 +1,14 @@ def __new__( cls, +{{#if getHasMultipleTypes}} *args: typing.Union[{{> model_templates/schema_python_types }}], +{{else}} +{{#if isArray }} + arg: typing.Union[typing.Tuple[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]], +{{else}} + *args: typing.Union[{{> model_templates/schema_python_types }}], +{{/if}} +{{/if}} {{#unless isNull}} {{#if getHasRequired}} {{#each getRequiredVarsMap}} @@ -35,10 +43,18 @@ def __new__( **kwargs: typing.Union[MetaOapg.additional_properties, {{> model_templates/schema_python_types }}], {{/if}} {{/with}} -) -> '{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}': +) -> '{{> model_templates/classname }}': return super().__new__( cls, +{{#if getHasMultipleTypes}} *args, +{{else}} +{{#if isArray }} + arg, +{{else}} + *args, +{{/if}} +{{/if}} {{#unless isNull}} {{#if getHasRequired}} {{#each getRequiredVarsMap}} diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints.handlebars index b1ff490c55c..04e3ece4734 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints.handlebars @@ -1,6 +1,26 @@ -{{#if vars}} +{{#or getRequiredVarsMap vars}} +{{/or}} +{{#if getRequiredVarsMap}} +{{#each getRequiredVarsMap}} +{{#with this}} +{{#unless nameInSnakeCase}} +{{#if complexType}} +{{baseName}}: '{{complexType}}' +{{else}} +{{#if schemaIsFromAdditionalProperties}} +{{baseName}}: MetaOapg.additional_properties +{{else}} +{{baseName}}: MetaOapg.properties.{{baseName}} +{{/if}} +{{/if}} +{{/unless}} +{{/with}} +{{/each}} +{{/if}} +{{#if vars}} {{#each vars}} +{{#unless required}} {{#unless nameInSnakeCase}} {{#if complexType}} {{baseName}}: '{{complexType}}' @@ -8,5 +28,6 @@ {{baseName}}: MetaOapg.properties.{{baseName}} {{/if}} {{/unless}} +{{/unless}} {{/each}} {{/if}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars index 63f7b054a24..d258f065887 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_composed_or_anytype.handlebars @@ -31,10 +31,21 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}} {{/if}} """ {{/if}} -{{#or hasValidation composedSchemas isMap isAnyType}} +{{#or hasValidation composedSchemas isMap isAnyType getItems}} class MetaOapg: +{{#with items}} +{{#if complexType}} + + @classmethod + @property + def {{baseName}}(cls) -> typing.Type['{{complexType}}']: + return {{complexType}} +{{else}} + {{> model_templates/schema }} +{{/if}} +{{/with}} {{#or isMap isAnyType}} {{> model_templates/dict_partial }} {{/or}} @@ -48,6 +59,7 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}} {{#if isEnum}} {{> model_templates/enums }} {{/if}} + {{> model_templates/property_type_hints }} {{> model_templates/new }} diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars index 3afcc46673b..c44b729022e 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema_list.handlebars @@ -1,6 +1,6 @@ -class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}}( +class {{> model_templates/classname }}( schemas.ListSchema ): {{#if this.classname}} @@ -28,4 +28,9 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}} {{else}} {{> model_templates/schema }} {{/if}} -{{/with}} \ No newline at end of file +{{/with}} + + {{> model_templates/new }} + + def __getitem__(self, i) -> {{#with items}}{{#if complexType}}'{{baseName}}'{{else}}MetaOapg.items{{/if}}{{/with}}: + return super().__getitem__(i) diff --git a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars index 05127b9227f..1475d68ba30 100644 --- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars +++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars @@ -1512,11 +1512,12 @@ class DictBase(Discriminable, ValidatorBase): dict_items[property_name_js] = new_value return dict_items - def __setattr__(self, name, value): + def __setattr__(self, name: str, value: typing.Any): if not isinstance(self, FileIO): raise AttributeError('property setting not supported on immutable instances') - def __getattr__(self, name): + def __getattr__(self, name: str): + # for instance.name access if isinstance(self, frozendict): # if an attribute does not exist try: @@ -1525,13 +1526,6 @@ class DictBase(Discriminable, ValidatorBase): raise AttributeError(str(ex)) return super().__getattr__(self, name) - def __getattribute__(self, name): - # if an attribute does exist (for example as a class property but not as an instance method) - try: - return self[name] - except (KeyError, TypeError): - return super().__getattribute__(name) - def cast_to_allowed_types( arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict, list, tuple, bytes, Schema], @@ -1821,7 +1815,7 @@ class ListSchema( def _from_openapi_data(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[list, tuple], **kwargs: ValidationMetadata): + def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1836,7 +1830,7 @@ class NoneSchema( def _from_openapi_data(cls, arg: None, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: None, **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: None, **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1855,7 +1849,7 @@ class NumberSchema( def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1898,7 +1892,7 @@ class IntSchema(IntBase, NumberSchema): def _from_openapi_data(cls, arg: int, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1983,31 +1977,31 @@ class StrSchema( def _from_openapi_data(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema': return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class UUIDSchema(UUIDBase, StrSchema): - def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DateSchema(DateBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DateTimeSchema(DateTimeBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DecimalSchema(DecimalBase, StrSchema): - def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str], **kwargs: Configuration): """ 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) @@ -2026,7 +2020,7 @@ class BytesSchema( """ this class will subclass bytes and is immutable """ - def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration): return super(Schema, cls).__new__(cls, arg) @@ -2051,7 +2045,7 @@ class FileSchema( - to be able to preserve file name info """ - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration): return super(Schema, cls).__new__(cls, arg) @@ -2071,7 +2065,7 @@ class BinarySchema( FileSchema, ] - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration): return super().__new__(cls, arg) @@ -2086,7 +2080,7 @@ class BoolSchema( def _from_openapi_data(cls, arg: bool, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: bool, **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: bool, **kwargs: ValidationMetadata): return super().__new__(cls, arg, **kwargs) diff --git a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 69476a84004..82b3f9f0dfb 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1995,6 +1995,8 @@ components: - _abc - '-efg' - (xyz) + - COUNT_1M + - COUNT_50M Enum_Test: type: object required: diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py index d740b8d23a6..16fb25e0259 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.py @@ -39,6 +39,7 @@ class AdditionalpropertiesAreAllowedByDefault( foo = schemas.AnyTypeSchema bar = schemas.AnyTypeSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo bar: MetaOapg.properties.bar diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py index 1c1016db345..aa8c3505142 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.py @@ -47,6 +47,7 @@ class AdditionalpropertiesShouldNotLookInApplicators( class properties: foo = schemas.AnyTypeSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo @@ -80,6 +81,7 @@ class AdditionalpropertiesShouldNotLookInApplicators( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py index e5a5f4fdbbe..6a22ff82a78 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.py @@ -50,6 +50,7 @@ class Allof( class properties: bar = schemas.IntSchema additional_properties = schemas.AnyTypeSchema + bar: MetaOapg.properties.bar @@ -81,6 +82,7 @@ class Allof( class properties: foo = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo @@ -115,6 +117,7 @@ class Allof( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py index 1285533ec08..5e8ef76295e 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.py @@ -47,6 +47,7 @@ class AllofCombinedWithAnyofOneof( additional_properties = schemas.AnyTypeSchema multiple_of = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -70,6 +71,7 @@ class AllofCombinedWithAnyofOneof( additional_properties = schemas.AnyTypeSchema multiple_of = 5 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -93,6 +95,7 @@ class AllofCombinedWithAnyofOneof( additional_properties = schemas.AnyTypeSchema multiple_of = 3 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -151,6 +154,7 @@ class AllofCombinedWithAnyofOneof( cls.any_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py index 0035ec43d63..906799e8e1a 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.py @@ -47,6 +47,7 @@ class AllofSimpleTypes( additional_properties = schemas.AnyTypeSchema inclusive_maximum = 30 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -70,6 +71,7 @@ class AllofSimpleTypes( additional_properties = schemas.AnyTypeSchema inclusive_minimum = 20 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -99,6 +101,7 @@ class AllofSimpleTypes( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py index 2357e979394..aae20d196c6 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.py @@ -55,6 +55,7 @@ class AllofWithBaseSchema( class properties: foo = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo @@ -86,6 +87,7 @@ class AllofWithBaseSchema( class properties: baz = schemas.NoneSchema additional_properties = schemas.AnyTypeSchema + baz: MetaOapg.properties.baz @@ -119,6 +121,7 @@ class AllofWithBaseSchema( cls.all_of_0, cls.all_of_1, ] + bar: MetaOapg.properties.bar diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py index 991f8bb3bd8..33a22fd6e6d 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.py @@ -53,6 +53,7 @@ class AllofWithOneEmptySchema( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py index 6713ebf8da2..6d84da0542b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.py @@ -55,6 +55,7 @@ class AllofWithTheFirstEmptySchema( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py index 236dea95602..6cc1aa17f66 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.py @@ -55,6 +55,7 @@ class AllofWithTheLastEmptySchema( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py index 4cec2c6e39d..ad346907c85 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.py @@ -55,6 +55,7 @@ class AllofWithTwoEmptySchemas( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py index a862e617209..3edc5fae427 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.py @@ -48,6 +48,7 @@ class Anyof( additional_properties = schemas.AnyTypeSchema inclusive_minimum = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -77,6 +78,7 @@ class Anyof( cls.any_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py index 95ae2c643b2..ac365c4d4b3 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.py @@ -50,6 +50,7 @@ class AnyofComplexTypes( class properties: bar = schemas.IntSchema additional_properties = schemas.AnyTypeSchema + bar: MetaOapg.properties.bar @@ -81,6 +82,7 @@ class AnyofComplexTypes( class properties: foo = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo @@ -115,6 +117,7 @@ class AnyofComplexTypes( cls.any_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py index 18f31a7c180..678486d5e10 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.py @@ -47,6 +47,7 @@ class AnyofWithBaseSchema( additional_properties = schemas.AnyTypeSchema max_length = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -70,6 +71,7 @@ class AnyofWithBaseSchema( additional_properties = schemas.AnyTypeSchema min_length = 4 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -99,6 +101,7 @@ class AnyofWithBaseSchema( cls.any_of_1, ] + def __new__( cls, *args: typing.Union[str, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py index 5659dae773f..134bee36cc7 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.py @@ -55,6 +55,7 @@ class AnyofWithOneEmptySchema( cls.any_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py index 6e3659dba1f..ea30435bdfd 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/array_type_matches_arrays.py @@ -36,3 +36,17 @@ class ArrayTypeMatchesArrays( class MetaOapg: items = schemas.AnyTypeSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ArrayTypeMatchesArrays': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py index 5c7f4edff3e..0c42b6586ea 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.py @@ -38,6 +38,7 @@ class ByInt( additional_properties = schemas.AnyTypeSchema multiple_of = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py index ae446097718..1ca409d58cf 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.py @@ -38,6 +38,7 @@ class ByNumber( additional_properties = schemas.AnyTypeSchema multiple_of = 1.5 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py index 1583673b71a..47fa0999ff9 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.py @@ -38,6 +38,7 @@ class BySmallNumber( additional_properties = schemas.AnyTypeSchema multiple_of = 0.00010 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py index 6489977862e..9869d50a94d 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.py @@ -71,8 +71,8 @@ class EnumsInProperties( return cls("bar") additional_properties = schemas.AnyTypeSchema - foo: MetaOapg.properties.foo bar: MetaOapg.properties.bar + foo: MetaOapg.properties.foo def __new__( cls, diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py index c95307d9dee..6c61870411b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.py @@ -47,6 +47,7 @@ class ForbiddenProperty( additional_properties = schemas.AnyTypeSchema not_schema = schemas.AnyTypeSchema + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -60,6 +61,7 @@ class ForbiddenProperty( **kwargs, ) additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py index bf497920065..6cbdd821053 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.py @@ -46,6 +46,7 @@ class InvalidStringValueForDefault( class MetaOapg: min_length = 4 additional_properties = schemas.AnyTypeSchema + bar: MetaOapg.properties.bar diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py index 35fcc0d4aeb..b2235207e01 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.py @@ -38,6 +38,7 @@ class MaximumValidation( additional_properties = schemas.AnyTypeSchema inclusive_maximum = 3.0 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py index dc1d63d80a8..b9a37250d58 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.py @@ -38,6 +38,7 @@ class MaximumValidationWithUnsignedInteger( additional_properties = schemas.AnyTypeSchema inclusive_maximum = 300 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py index dba5afe1988..b1886db94a5 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.py @@ -38,6 +38,7 @@ class MaxitemsValidation( additional_properties = schemas.AnyTypeSchema max_items = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py index 1d2b47b86a9..7906651bf1d 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.py @@ -38,6 +38,7 @@ class MaxlengthValidation( additional_properties = schemas.AnyTypeSchema max_length = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py index d90bdad63b5..77c77f4e0ee 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.py @@ -38,6 +38,7 @@ class Maxproperties0MeansTheObjectIsEmpty( additional_properties = schemas.AnyTypeSchema max_properties = 0 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py index 39160e6dc53..f61e64a518b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.py @@ -38,6 +38,7 @@ class MaxpropertiesValidation( additional_properties = schemas.AnyTypeSchema max_properties = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py index 999d0c4811f..9ca4b46e06b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.py @@ -38,6 +38,7 @@ class MinimumValidation( additional_properties = schemas.AnyTypeSchema inclusive_minimum = 1.1 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py index c4f6fde8aeb..a36d83fb876 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.py @@ -38,6 +38,7 @@ class MinimumValidationWithSignedInteger( additional_properties = schemas.AnyTypeSchema inclusive_minimum = -2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py index 66be670e765..648c99d88e6 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.py @@ -38,6 +38,7 @@ class MinitemsValidation( additional_properties = schemas.AnyTypeSchema min_items = 1 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py index 798d40b9015..2ccfc98dc56 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.py @@ -38,6 +38,7 @@ class MinlengthValidation( additional_properties = schemas.AnyTypeSchema min_length = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py index 2eab29e5c2e..a4b7eac9e41 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.py @@ -38,6 +38,7 @@ class MinpropertiesValidation( additional_properties = schemas.AnyTypeSchema min_properties = 1 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py index 9740c9e1ac2..12874887b59 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.py @@ -38,6 +38,7 @@ class ModelNot( additional_properties = schemas.AnyTypeSchema not_schema = schemas.IntSchema + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py index f6b9f97ead7..9653eb9b33b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.py @@ -62,6 +62,7 @@ class NestedAllofToCheckValidationSemantics( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -90,6 +91,7 @@ class NestedAllofToCheckValidationSemantics( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py index b0cdb7a76c3..723db11368d 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.py @@ -62,6 +62,7 @@ class NestedAnyofToCheckValidationSemantics( cls.any_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -90,6 +91,7 @@ class NestedAnyofToCheckValidationSemantics( cls.any_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py index 44b8c6332eb..120abc7203d 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_items.py @@ -60,3 +60,59 @@ class NestedItems( class MetaOapg: items = schemas.NumberSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'items': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, tuple, ]], typing.List[typing.Union[MetaOapg.items, tuple, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'items': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, tuple, ]], typing.List[typing.Union[MetaOapg.items, tuple, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'items': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, tuple, ]], typing.List[typing.Union[MetaOapg.items, tuple, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'NestedItems': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py index e1492746260..729bfeb75dd 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.py @@ -62,6 +62,7 @@ class NestedOneofToCheckValidationSemantics( cls.one_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -90,6 +91,7 @@ class NestedOneofToCheckValidationSemantics( cls.one_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py index fe096fc6257..283b0dca3f4 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.py @@ -65,6 +65,7 @@ class NotMoreComplexSchema( **kwargs, ) + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py index e2e6c302f95..9ac7a0cf747 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.py @@ -39,6 +39,7 @@ class ObjectPropertiesValidation( foo = schemas.IntSchema bar = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo bar: MetaOapg.properties.bar diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py index 33a39b78763..91f070645cd 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.py @@ -48,6 +48,7 @@ class Oneof( additional_properties = schemas.AnyTypeSchema inclusive_minimum = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -77,6 +78,7 @@ class Oneof( cls.one_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py index b9b4597ecd0..d8c45cc7041 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.py @@ -50,6 +50,7 @@ class OneofComplexTypes( class properties: bar = schemas.IntSchema additional_properties = schemas.AnyTypeSchema + bar: MetaOapg.properties.bar @@ -81,6 +82,7 @@ class OneofComplexTypes( class properties: foo = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo @@ -115,6 +117,7 @@ class OneofComplexTypes( cls.one_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py index 494597e377a..63f0250877c 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.py @@ -47,6 +47,7 @@ class OneofWithBaseSchema( additional_properties = schemas.AnyTypeSchema min_length = 2 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -70,6 +71,7 @@ class OneofWithBaseSchema( additional_properties = schemas.AnyTypeSchema max_length = 4 + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -99,6 +101,7 @@ class OneofWithBaseSchema( cls.one_of_1, ] + def __new__( cls, *args: typing.Union[str, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py index 1628c39f33d..4c692af7319 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.py @@ -55,6 +55,7 @@ class OneofWithEmptySchema( cls.one_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py index 6fc07b26fdc..875588226b5 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.py @@ -51,6 +51,10 @@ class OneofWithRequired( } additional_properties = schemas.AnyTypeSchema + + bar: MetaOapg.additional_properties + foo: MetaOapg.additional_properties + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -77,6 +81,10 @@ class OneofWithRequired( } additional_properties = schemas.AnyTypeSchema + + foo: MetaOapg.additional_properties + baz: MetaOapg.additional_properties + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -106,6 +114,7 @@ class OneofWithRequired( cls.one_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py index b5c8be660d2..3af5c3dbf4c 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.py @@ -40,6 +40,7 @@ class PatternIsNotAnchored( 'pattern': r'a+', # noqa: E501 }] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py index 681487d4261..e002eb177b0 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.py @@ -40,6 +40,7 @@ class PatternValidation( 'pattern': r'^a*$', # noqa: E501 }] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py index 700ab475dce..5693faa67b7 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.py @@ -115,6 +115,7 @@ class PropertiesWithEscapedCharacters( If the property is required and was not passed in, an exception will be thrown """ additional_properties = schemas.AnyTypeSchema + def __new__( diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py index a103535ace9..285c9ef6658 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.py @@ -50,6 +50,7 @@ class PropertyNamedRefThatIsNotAReference( If the property is required and was not passed in, an exception will be thrown """ additional_properties = schemas.AnyTypeSchema + def __new__( diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py index bf0b9815cc4..fb36ddcd361 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.py @@ -52,6 +52,7 @@ class RefInAllof( PropertyNamedRefThatIsNotAReference, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py index 36391b1853d..d66c5bd5c7e 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.py @@ -52,6 +52,7 @@ class RefInAnyof( PropertyNamedRefThatIsNotAReference, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py index b59a46c4a63..6c0f9d5ada2 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_items.py @@ -41,4 +41,18 @@ class RefInItems( def items(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']: return PropertyNamedRefThatIsNotAReference + def __new__( + cls, + arg: typing.Union[typing.Tuple['PropertyNamedRefThatIsNotAReference'], typing.List['PropertyNamedRefThatIsNotAReference']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'RefInItems': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + from unit_test_api.model.property_named_ref_that_is_not_a_reference import PropertyNamedRefThatIsNotAReference diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py index b5b521958aa..4855b4a7178 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.py @@ -42,6 +42,7 @@ class RefInNot( def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']: return PropertyNamedRefThatIsNotAReference + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py index cefe9493294..d87a95f3359 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.py @@ -52,6 +52,7 @@ class RefInOneof( PropertyNamedRefThatIsNotAReference, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py index 7384ea07191..7e45ff50284 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.py @@ -42,6 +42,7 @@ class RefInProperty( def a(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']: return PropertyNamedRefThatIsNotAReference additional_properties = schemas.AnyTypeSchema + a: 'PropertyNamedRefThatIsNotAReference' diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py index 027510dd218..f48938c0d34 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.py @@ -38,6 +38,7 @@ class RequiredDefaultValidation( class properties: foo = schemas.AnyTypeSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py index dbf7d120948..8ab6fbf82dc 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.py @@ -42,6 +42,7 @@ class RequiredValidation( foo = schemas.AnyTypeSchema bar = schemas.AnyTypeSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo bar: MetaOapg.properties.bar diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py index 9067e9e7a02..5bbfe97730b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.py @@ -38,6 +38,7 @@ class RequiredWithEmptyArray( class properties: foo = schemas.AnyTypeSchema additional_properties = schemas.AnyTypeSchema + foo: MetaOapg.properties.foo diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py index 5be3b32c040..42bd88a1e76 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.py @@ -45,6 +45,8 @@ class RequiredWithEscapedCharacters( } additional_properties = schemas.AnyTypeSchema + + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py index a9729cd100b..fd77f59ba92 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.py @@ -38,6 +38,7 @@ class UniqueitemsFalseValidation( additional_properties = schemas.AnyTypeSchema unique_items = False + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py index 77c7569feb9..cac14b11977 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.py @@ -38,6 +38,7 @@ class UniqueitemsValidation( additional_properties = schemas.AnyTypeSchema unique_items = True + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py index 5cd47a70ab4..49b78114b08 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post.py @@ -63,6 +63,7 @@ class SchemaForRequestBodyApplicationJson( **kwargs, ) + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py index f3ec9be04de..ac624957d5f 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.py @@ -36,6 +36,7 @@ class SchemaForRequestBodyApplicationJson( additional_properties = schemas.AnyTypeSchema not_schema = schemas.IntSchema + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py index 54eaea64aaf..203182e8fb1 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.py @@ -42,6 +42,7 @@ class SchemaForRequestBodyApplicationJson( def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']: return PropertyNamedRefThatIsNotAReference + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py index 3e6b5d4662e..99feda92290 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post.py @@ -43,6 +43,8 @@ class SchemaForRequestBodyApplicationJson( } additional_properties = schemas.AnyTypeSchema + + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py index 62b0ff3ec6a..a96f8e87054 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post.py @@ -62,6 +62,7 @@ class SchemaFor200ResponseBodyApplicationJson( **kwargs, ) + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py index d4fdfbf9d13..fd35fa873a4 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post.py @@ -35,6 +35,7 @@ class SchemaFor200ResponseBodyApplicationJson( additional_properties = schemas.AnyTypeSchema not_schema = schemas.IntSchema + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py index 64d65404b79..d88ea891fe9 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post.py @@ -41,6 +41,7 @@ class SchemaFor200ResponseBodyApplicationJson( def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']: return PropertyNamedRefThatIsNotAReference + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py index 8d1b962e447..d26e7933993 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post.py @@ -42,6 +42,8 @@ class SchemaFor200ResponseBodyApplicationJson( } additional_properties = schemas.AnyTypeSchema + + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py index afa574efe43..6f146a5da3b 100644 --- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py +++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/schemas.py @@ -1519,11 +1519,12 @@ class DictBase(Discriminable, ValidatorBase): dict_items[property_name_js] = new_value return dict_items - def __setattr__(self, name, value): + def __setattr__(self, name: str, value: typing.Any): if not isinstance(self, FileIO): raise AttributeError('property setting not supported on immutable instances') - def __getattr__(self, name): + def __getattr__(self, name: str): + # for instance.name access if isinstance(self, frozendict): # if an attribute does not exist try: @@ -1532,13 +1533,6 @@ class DictBase(Discriminable, ValidatorBase): raise AttributeError(str(ex)) return super().__getattr__(self, name) - def __getattribute__(self, name): - # if an attribute does exist (for example as a class property but not as an instance method) - try: - return self[name] - except (KeyError, TypeError): - return super().__getattribute__(name) - def cast_to_allowed_types( arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict, list, tuple, bytes, Schema], @@ -1828,7 +1822,7 @@ class ListSchema( def _from_openapi_data(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[list, tuple], **kwargs: ValidationMetadata): + def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1843,7 +1837,7 @@ class NoneSchema( def _from_openapi_data(cls, arg: None, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: None, **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: None, **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1862,7 +1856,7 @@ class NumberSchema( def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1905,7 +1899,7 @@ class IntSchema(IntBase, NumberSchema): def _from_openapi_data(cls, arg: int, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1990,31 +1984,31 @@ class StrSchema( def _from_openapi_data(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema': return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class UUIDSchema(UUIDBase, StrSchema): - def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DateSchema(DateBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DateTimeSchema(DateTimeBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DecimalSchema(DecimalBase, StrSchema): - def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str], **kwargs: Configuration): """ 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) @@ -2033,7 +2027,7 @@ class BytesSchema( """ this class will subclass bytes and is immutable """ - def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration): return super(Schema, cls).__new__(cls, arg) @@ -2058,7 +2052,7 @@ class FileSchema( - to be able to preserve file name info """ - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration): return super(Schema, cls).__new__(cls, arg) @@ -2078,7 +2072,7 @@ class BinarySchema( FileSchema, ] - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration): return super().__new__(cls, arg) @@ -2093,7 +2087,7 @@ class BoolSchema( def _from_openapi_data(cls, arg: bool, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: bool, **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: bool, **kwargs: ValidationMetadata): return super().__new__(cls, arg, **kwargs) diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumClass.md index 44aec32595f..085bdb48389 100644 --- a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumClass.md +++ b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumClass.md @@ -2,7 +2,7 @@ Type | Description | Notes ------------- | ------------- | ------------- -**str** | | defaults to "-efg", must be one of ["_abc", "-efg", "(xyz)", ] +**str** | | defaults to "-efg", must be one of ["_abc", "-efg", "(xyz)", "COUNT_1M", "COUNT_50M", ] [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py index 011ae6ae228..4d139f0f038 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.py @@ -48,6 +48,20 @@ class AdditionalPropertiesWithArrayOfEnums( @property def items(cls) -> typing.Type['EnumClass']: return EnumClass + + def __new__( + cls, + arg: typing.Union[typing.Tuple['EnumClass'], typing.List['EnumClass']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'additional_properties': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) def __new__( cls, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py index fdecd7b516b..7c1606e99a1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py @@ -41,4 +41,18 @@ class AnimalFarm( def items(cls) -> typing.Type['Animal']: return Animal + def __new__( + cls, + arg: typing.Union[typing.Tuple['Animal'], typing.List['Animal']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'AnimalFarm': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + from petstore_api.model.animal import Animal diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py index f2061c8e4ee..e8e1f3b0bb7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.py @@ -38,6 +38,7 @@ class AnyTypeNotString( additional_properties = schemas.AnyTypeSchema not_schema = schemas.StrSchema + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py index 66b7498ec0d..b4060a48668 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py @@ -68,6 +68,7 @@ class Apple( ) }] additional_properties = schemas.AnyTypeSchema + cultivar: MetaOapg.properties.cultivar origin: MetaOapg.properties.origin diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py index 1750b671fd2..a0cffcdd22d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_holding_any_type.py @@ -36,3 +36,17 @@ class ArrayHoldingAnyType( class MetaOapg: items = schemas.AnyTypeSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ArrayHoldingAnyType': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py index 0944d538f7b..a9f11f1b18b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py @@ -53,6 +53,34 @@ class ArrayOfArrayOfNumberOnly( class MetaOapg: items = schemas.NumberSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'items': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, tuple, ]], typing.List[typing.Union[MetaOapg.items, tuple, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ArrayArrayNumber': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) additional_properties = schemas.AnyTypeSchema ArrayArrayNumber: MetaOapg.properties.ArrayArrayNumber diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py index fba8f72457b..98fc48db7b7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py @@ -41,4 +41,18 @@ class ArrayOfEnums( def items(cls) -> typing.Type['StringEnum']: return StringEnum + def __new__( + cls, + arg: typing.Union[typing.Tuple['StringEnum'], typing.List['StringEnum']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ArrayOfEnums': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + from petstore_api.model.string_enum import StringEnum diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py index 9d5aaa98216..ca9f73cf200 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py @@ -45,6 +45,20 @@ class ArrayOfNumberOnly( class MetaOapg: items = schemas.NumberSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ArrayNumber': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) additional_properties = schemas.AnyTypeSchema ArrayNumber: MetaOapg.properties.ArrayNumber diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py index ef24848c0da..14f7c0cffd2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py @@ -46,6 +46,20 @@ class ArrayTest( class MetaOapg: items = schemas.StrSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'array_of_string': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class array_array_of_integer( schemas.ListSchema @@ -62,6 +76,34 @@ class ArrayTest( class MetaOapg: items = schemas.Int64Schema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, int, ]], typing.List[typing.Union[MetaOapg.items, int, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'items': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, tuple, ]], typing.List[typing.Union[MetaOapg.items, tuple, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'array_array_of_integer': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) class array_array_of_model( @@ -83,6 +125,34 @@ class ArrayTest( @property def items(cls) -> typing.Type['ReadOnlyFirst']: return ReadOnlyFirst + + def __new__( + cls, + arg: typing.Union[typing.Tuple['ReadOnlyFirst'], typing.List['ReadOnlyFirst']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'items': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, tuple, ]], typing.List[typing.Union[MetaOapg.items, tuple, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'array_array_of_model': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) additional_properties = schemas.AnyTypeSchema array_of_string: MetaOapg.properties.array_of_string diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py index 8eb20bf1443..43db6f04212 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_with_validations_in_items.py @@ -45,3 +45,17 @@ class ArrayWithValidationsInItems( class MetaOapg: inclusive_maximum = 7 + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, int, ]], typing.List[typing.Union[MetaOapg.items, int, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ArrayWithValidationsInItems': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py index 94584053b97..c6770828f05 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py @@ -81,6 +81,7 @@ class Cat( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py index f6cd962f0c9..95de35ce3f2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py @@ -43,8 +43,8 @@ class Category( name = schemas.StrSchema additional_properties = schemas.AnyTypeSchema - id: MetaOapg.properties.id name: MetaOapg.properties.name + id: MetaOapg.properties.id def __new__( cls, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py index 89cc90bb252..6ed89b25e40 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py @@ -81,6 +81,7 @@ class ChildCat( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py index a118ce63b50..17ce3e1f143 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py @@ -40,6 +40,7 @@ class ClassModel( class properties: _class = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + _class: MetaOapg.properties._class diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py index 2e86b80766e..96d4104c381 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py @@ -95,6 +95,7 @@ class ComplexQuadrilateral( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py index 0977a76d205..3b9a6338bef 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.py @@ -54,6 +54,20 @@ class ComposedAnyOfDifferentTypesNoValidations( class MetaOapg: items = schemas.AnyTypeSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'any_of_9': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) any_of_10 = schemas.NumberSchema any_of_11 = schemas.Float32Schema any_of_12 = schemas.Float64Schema @@ -91,6 +105,7 @@ class ComposedAnyOfDifferentTypesNoValidations( cls.any_of_15, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py index db68da43f59..5be20b3ffb4 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_array.py @@ -36,3 +36,17 @@ class ComposedArray( class MetaOapg: items = schemas.AnyTypeSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ComposedArray': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py index 6f0b76958f9..6f51a056acd 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_bool.py @@ -53,6 +53,7 @@ class ComposedBool( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[bool, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py index 093617a84d5..2b0c6c8b866 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_none.py @@ -53,6 +53,7 @@ class ComposedNone( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[None, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py index 3c2b931f9e6..6a2b76f9923 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_number.py @@ -53,6 +53,7 @@ class ComposedNumber( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[decimal.Decimal, int, float, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py index fa7eb338579..593cd6bff51 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.py @@ -54,6 +54,7 @@ class ComposedObject( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py index eb1c22d6a6c..84355df077b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.py @@ -76,6 +76,20 @@ class ComposedOneOfDifferentTypes( min_items = 4 items = schemas.AnyTypeSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'one_of_5': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class one_of_6( schemas.DateTimeSchema @@ -108,6 +122,7 @@ class ComposedOneOfDifferentTypes( cls.one_of_6, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py index 03a1a892e3b..03cbbf8a41b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_string.py @@ -53,6 +53,7 @@ class ComposedString( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[str, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py index 09e26584fbd..4b38cc9eb9b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py @@ -81,6 +81,7 @@ class Dog( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py index 7b2f10cc25d..21318833e9e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.py @@ -64,6 +64,20 @@ class Drawing( @property def items(cls) -> typing.Type['Shape']: return Shape + + def __new__( + cls, + arg: typing.Union[typing.Tuple['Shape'], typing.List['Shape']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'shapes': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) @classmethod @property diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py index 1258473a51e..3ec3bace81b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py @@ -86,6 +86,20 @@ class EnumArrays( @property def CRAB(cls): return cls("crab") + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'array_enum': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) additional_properties = schemas.AnyTypeSchema just_symbol: MetaOapg.properties.just_symbol diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py index 74e6dafcfc3..dceedc21dff 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_class.py @@ -30,6 +30,8 @@ class EnumClass( "_abc": "_ABC", "-efg": "EFG", "(xyz)": "XYZ", + "COUNT_1M": "COUNT_1M", + "COUNT_50M": "COUNT_50M", } ), schemas.StrSchema @@ -54,3 +56,13 @@ class EnumClass( @property def XYZ(cls): return cls("(xyz)") + + @classmethod + @property + def COUNT_1M(cls): + return cls("COUNT_1M") + + @classmethod + @property + def COUNT_50M(cls): + return cls("COUNT_50M") diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py index 6e24c67fb05..fbf136e3edf 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py @@ -162,8 +162,8 @@ class EnumTest( return IntegerEnumOneValue additional_properties = schemas.AnyTypeSchema - enum_string: MetaOapg.properties.enum_string enum_string_required: MetaOapg.properties.enum_string_required + enum_string: MetaOapg.properties.enum_string enum_integer: MetaOapg.properties.enum_integer enum_number: MetaOapg.properties.enum_number stringEnum: 'StringEnum' diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py index c7767d72530..d4a85e194b6 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py @@ -95,6 +95,7 @@ class EquilateralTriangle( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py index 92ab6072eb5..2c00ea3fac3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py @@ -54,6 +54,20 @@ class FileSchemaTestClass( @property def items(cls) -> typing.Type['File']: return File + + def __new__( + cls, + arg: typing.Union[typing.Tuple['File'], typing.List['File']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'files': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) additional_properties = schemas.AnyTypeSchema file: 'File' diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py index 5b4e845fc20..7919c23c205 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py @@ -121,6 +121,20 @@ class FormatTest( unique_items = True items = schemas.NumberSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.items, decimal.Decimal, int, float, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'arrayWithUniqueItems': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class string( schemas.StrSchema @@ -178,23 +192,23 @@ class FormatTest( noneProp = schemas.NoneSchema additional_properties = schemas.AnyTypeSchema + date: MetaOapg.properties.date + number: MetaOapg.properties.number + password: MetaOapg.properties.password + byte: MetaOapg.properties.byte integer: MetaOapg.properties.integer int32: MetaOapg.properties.int32 int32withValidations: MetaOapg.properties.int32withValidations int64: MetaOapg.properties.int64 - number: MetaOapg.properties.number float32: MetaOapg.properties.float32 double: MetaOapg.properties.double float64: MetaOapg.properties.float64 arrayWithUniqueItems: MetaOapg.properties.arrayWithUniqueItems string: MetaOapg.properties.string - byte: MetaOapg.properties.byte binary: MetaOapg.properties.binary - date: MetaOapg.properties.date dateTime: MetaOapg.properties.dateTime uuid: MetaOapg.properties.uuid uuidNoExample: MetaOapg.properties.uuidNoExample - password: MetaOapg.properties.password pattern_with_digits: MetaOapg.properties.pattern_with_digits pattern_with_digits_and_delimiter: MetaOapg.properties.pattern_with_digits_and_delimiter noneProp: MetaOapg.properties.noneProp diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py index 5d88e20390c..b7cc5e24a9d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py @@ -54,6 +54,7 @@ class Fruit( Apple, Banana, ] + color: MetaOapg.properties.color diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py index 7905100682b..4a90c88f107 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.py @@ -55,6 +55,7 @@ class FruitReq( BananaReq, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py index b377123a10d..a39844a04e1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py @@ -54,6 +54,7 @@ class GmFruit( Apple, Banana, ] + color: MetaOapg.properties.color diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py index 2b9bd4a0b03..62bce0a14b3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py @@ -47,6 +47,7 @@ class HealthCheckResult( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, str, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py index bfbf1b5beb0..9f20e656aa9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py @@ -95,6 +95,7 @@ class IsoscelesTriangle( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py index e0ca714acdb..1c09c748c9e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.py @@ -65,6 +65,7 @@ class Mammal( Pig, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py index 242ebbf9cbb..b42718ce256 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py @@ -53,6 +53,7 @@ class Model200Response( If the property is required and was not passed in, an exception will be thrown """ additional_properties = schemas.AnyTypeSchema + name: MetaOapg.properties.name diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py index 60a2bdabc36..2cdddc4063f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py @@ -52,6 +52,7 @@ class ModelReturn( If the property is required and was not passed in, an exception will be thrown """ additional_properties = schemas.AnyTypeSchema + def __new__( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py index fa0d71b2ef9..50fa7e22cb3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py @@ -57,6 +57,7 @@ class Name( If the property is required and was not passed in, an exception will be thrown """ additional_properties = schemas.AnyTypeSchema + name: MetaOapg.properties.name snake_case: MetaOapg.properties.snake_case diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py index 505e658fb5c..bb1d12722d7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.py @@ -45,6 +45,7 @@ class NullableClass( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, int, ], @@ -64,6 +65,7 @@ class NullableClass( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, decimal.Decimal, int, float, ], @@ -83,6 +85,7 @@ class NullableClass( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, bool, ], @@ -102,6 +105,7 @@ class NullableClass( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, str, ], @@ -121,6 +125,7 @@ class NullableClass( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, date, str, ], @@ -140,6 +145,7 @@ class NullableClass( schemas.Schema ): + def __new__( cls, *args: typing.Union[None, datetime, str, ], @@ -159,6 +165,11 @@ class NullableClass( schemas.Schema ): + + class MetaOapg: + items = schemas.DictSchema + + def __new__( cls, *args: typing.Union[tuple, None, ], @@ -178,6 +189,36 @@ class NullableClass( schemas.Schema ): + + class MetaOapg: + + + class items( + schemas.SchemaTypeCheckerClsFactory(typing.Union[frozendict, schemas.NoneClass, ]), + schemas.DictBase, + schemas.NoneBase, + schemas.Schema + ): + + + class MetaOapg: + additional_properties = schemas.AnyTypeSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, None, ], + _configuration: typing.Optional[schemas.Configuration] = None, + **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], + ) -> 'items': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + def __new__( cls, *args: typing.Union[tuple, None, ], @@ -209,6 +250,7 @@ class NullableClass( class MetaOapg: additional_properties = schemas.AnyTypeSchema + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], @@ -222,6 +264,20 @@ class NullableClass( **kwargs, ) + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, dict, frozendict, None, ]], typing.List[typing.Union[MetaOapg.items, dict, frozendict, None, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'array_items_nullable': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class object_nullable_prop( schemas.SchemaTypeCheckerClsFactory(typing.Union[frozendict, schemas.NoneClass, ]), @@ -234,6 +290,7 @@ class NullableClass( class MetaOapg: additional_properties = schemas.DictSchema + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], @@ -270,6 +327,7 @@ class NullableClass( class MetaOapg: additional_properties = schemas.AnyTypeSchema + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], @@ -283,6 +341,7 @@ class NullableClass( **kwargs, ) + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], @@ -316,6 +375,7 @@ class NullableClass( class MetaOapg: additional_properties = schemas.AnyTypeSchema + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], @@ -354,6 +414,7 @@ class NullableClass( class MetaOapg: additional_properties = schemas.AnyTypeSchema + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py index 6ec394b3695..9ef49b7ce29 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.py @@ -57,6 +57,7 @@ class NullableShape( cls.one_of_2, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py index 3489217bd4e..95eef2e85a2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_string.py @@ -36,6 +36,7 @@ class NullableString( Do not edit the class manually. """ + def __new__( cls, *args: typing.Union[None, str, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py index 0ef08142ac6..4478e77a313 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py @@ -70,6 +70,7 @@ class ObjectWithInlineCompositionProperty( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py index bd9da617ea0..f68b5ec8fb3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.py @@ -62,6 +62,7 @@ class ParentPet( GrandparentAnimal, ] + def __new__( cls, *args: typing.Union[dict, frozendict, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py index 0ba7b13788e..4ba21ef25a6 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py @@ -59,6 +59,20 @@ class Pet( class MetaOapg: items = schemas.StrSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'photoUrls': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class tags( schemas.ListSchema @@ -72,6 +86,20 @@ class Pet( def items(cls) -> typing.Type['Tag']: return Tag + def __new__( + cls, + arg: typing.Union[typing.Tuple['Tag'], typing.List['Tag']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'tags': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + class status( schemas.SchemaEnumMakerClsFactory( @@ -100,10 +128,10 @@ class Pet( return cls("sold") additional_properties = schemas.AnyTypeSchema + photoUrls: MetaOapg.properties.photoUrls + name: MetaOapg.properties.name id: MetaOapg.properties.id category: 'Category' - name: MetaOapg.properties.name - photoUrls: MetaOapg.properties.photoUrls tags: MetaOapg.properties.tags status: MetaOapg.properties.status diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py index a907dba77ab..a4a578563bf 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.py @@ -63,6 +63,7 @@ class Pig( DanishPig, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py index 6cecbb80802..ea6a61302d0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.py @@ -63,6 +63,7 @@ class Quadrilateral( ComplexQuadrilateral, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py index 1a2af256f60..dbaae6c72e3 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py @@ -57,6 +57,7 @@ class QuadrilateralInterface( return cls("Quadrilateral") quadrilateralType = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + shapeType: MetaOapg.properties.shapeType quadrilateralType: MetaOapg.properties.quadrilateralType diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py index 7ce53acc4ce..5789f690ca7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py @@ -95,6 +95,7 @@ class ScaleneTriangle( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py index f0614401074..6635f10c1c2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.py @@ -63,6 +63,7 @@ class Shape( Quadrilateral, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py index 78986784ef1..cc0529a55d9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.py @@ -67,6 +67,7 @@ class ShapeOrNull( Quadrilateral, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py index 0c0530975b8..3946f6332db 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py @@ -95,6 +95,7 @@ class SimpleQuadrilateral( cls.all_of_1, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py index 2e9647cc42d..e0922b6105c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.py @@ -52,6 +52,7 @@ class SomeObject( ObjectInterface, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py index 044f498fcbb..26999f08c63 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_enum.py @@ -82,6 +82,7 @@ class StringEnum( def DOUBLE_QUOTE_WITH_NEWLINE(cls): return cls("double quote \n with newline") + def __new__( cls, *args: typing.Union[None, str, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py index 5156eb03d33..fbb348a1493 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.py @@ -65,6 +65,7 @@ class Triangle( ScaleneTriangle, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py index a711fb2eb82..e0bc1dcf0c7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py @@ -57,6 +57,7 @@ class TriangleInterface( return cls("Triangle") triangleType = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + shapeType: MetaOapg.properties.shapeType triangleType: MetaOapg.properties.triangleType diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py index f7e1a4c92d9..40a93671f2f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py @@ -58,6 +58,7 @@ class User( class MetaOapg: additional_properties = schemas.AnyTypeSchema + def __new__( cls, *args: typing.Union[dict, frozendict, None, ], @@ -82,6 +83,7 @@ class User( additional_properties = schemas.AnyTypeSchema not_schema = schemas.NoneSchema + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py index fb5c926bb9f..e3ac411e183 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py @@ -58,9 +58,9 @@ class Whale( return cls("whale") additional_properties = schemas.AnyTypeSchema + className: MetaOapg.properties.className hasBaleen: MetaOapg.properties.hasBaleen hasTeeth: MetaOapg.properties.hasTeeth - className: MetaOapg.properties.className def __new__( cls, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py index a4abbf04c65..02a5f9336aa 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.py @@ -83,8 +83,8 @@ class Zebra( return cls("zebra") additional_properties = schemas.AnyTypeSchema - type: MetaOapg.properties.type className: MetaOapg.properties.className + type: MetaOapg.properties.type def __new__( cls, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py index 4f1410a5be2..7634d6fae1f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.py @@ -144,14 +144,14 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( callback = schemas.StrSchema additional_properties = schemas.AnyTypeSchema + number: MetaOapg.properties.number + pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter + byte: MetaOapg.properties.byte + double: MetaOapg.properties.double integer: MetaOapg.properties.integer int32: MetaOapg.properties.int32 int64: MetaOapg.properties.int64 - number: MetaOapg.properties.number - double: MetaOapg.properties.double string: MetaOapg.properties.string - pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter - byte: MetaOapg.properties.byte binary: MetaOapg.properties.binary date: MetaOapg.properties.date dateTime: MetaOapg.properties.dateTime diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py index b853412972c..5bb07223d55 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.py @@ -55,6 +55,20 @@ class EnumQueryStringArraySchema( def DOLLAR(cls): return cls("$") + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'EnumQueryStringArraySchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class EnumQueryStringSchema( schemas.SchemaEnumMakerClsFactory( @@ -199,6 +213,20 @@ class EnumHeaderStringArraySchema( def DOLLAR(cls): return cls("$") + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'EnumHeaderStringArraySchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class EnumHeaderStringSchema( schemas.SchemaEnumMakerClsFactory( @@ -294,6 +322,20 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded( def DOLLAR(cls): return cls("$") + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'enum_form_string_array': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class enum_form_string( schemas.SchemaEnumMakerClsFactory( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py index f4bbfcf8164..435b1e0cd61 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.py @@ -59,6 +59,7 @@ class CompositionAtRootSchema( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -114,6 +115,7 @@ class CompositionInPropertySchema( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -210,6 +212,7 @@ class SchemaForRequestBodyApplicationJson( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -265,6 +268,7 @@ class SchemaForRequestBodyMultipartFormData( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -339,6 +343,7 @@ class SchemaFor200ResponseBodyApplicationJson( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], @@ -394,6 +399,7 @@ class SchemaFor200ResponseBodyMultipartFormData( cls.all_of_0, ] + def __new__( cls, *args: typing.Union[dict, frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py index 0f69de09f58..c27d8fffc04 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.py @@ -69,8 +69,8 @@ class SchemaForRequestBodyMultipartFormData( requiredFile = schemas.BinarySchema additional_properties = schemas.AnyTypeSchema - additionalMetadata: MetaOapg.properties.additionalMetadata requiredFile: MetaOapg.properties.requiredFile + additionalMetadata: MetaOapg.properties.additionalMetadata def __new__( cls, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py index bf13d549d91..f8b464e7c63 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_test_query_paramters/put.py @@ -36,6 +36,20 @@ class PipeSchema( class MetaOapg: items = schemas.StrSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'PipeSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class IoutilSchema( schemas.ListSchema @@ -45,6 +59,20 @@ class IoutilSchema( class MetaOapg: items = schemas.StrSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'IoutilSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class HttpSchema( schemas.ListSchema @@ -54,6 +82,20 @@ class HttpSchema( class MetaOapg: items = schemas.StrSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'HttpSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class UrlSchema( schemas.ListSchema @@ -63,6 +105,20 @@ class UrlSchema( class MetaOapg: items = schemas.StrSchema + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'UrlSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) + class ContextSchema( schemas.ListSchema @@ -71,6 +127,20 @@ class ContextSchema( class MetaOapg: items = schemas.StrSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'ContextSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) RefParamSchema = StringWithValidation RequestRequiredQueryParams = typing.TypedDict( 'RequestRequiredQueryParams', diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py index b6b0f457bfc..ee1e300e3d5 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.py @@ -43,8 +43,8 @@ class SchemaForRequestBodyMultipartFormData( file = schemas.BinarySchema additional_properties = schemas.AnyTypeSchema - additionalMetadata: MetaOapg.properties.additionalMetadata file: MetaOapg.properties.file + additionalMetadata: MetaOapg.properties.additionalMetadata def __new__( cls, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py index 6970589d541..3b759527410 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.py @@ -45,6 +45,20 @@ class SchemaForRequestBodyMultipartFormData( class MetaOapg: items = schemas.BinarySchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, ]], typing.List[typing.Union[MetaOapg.items, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'files': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) additional_properties = schemas.AnyTypeSchema files: MetaOapg.properties.files diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py index 3402ecb0ff5..ffa5af4ee4a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_status/get.py @@ -62,6 +62,20 @@ class StatusSchema( @property def SOLD(cls): return cls("sold") + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'StatusSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) RequestRequiredQueryParams = typing.TypedDict( 'RequestRequiredQueryParams', { @@ -104,6 +118,20 @@ class SchemaFor200ResponseBodyApplicationXml( def items(cls) -> typing.Type['Pet']: return Pet + def __new__( + cls, + arg: typing.Union[typing.Tuple['Pet'], typing.List['Pet']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'SchemaFor200ResponseBodyApplicationXml': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + class SchemaFor200ResponseBodyApplicationJson( schemas.ListSchema @@ -117,6 +145,20 @@ class SchemaFor200ResponseBodyApplicationJson( def items(cls) -> typing.Type['Pet']: return Pet + def __new__( + cls, + arg: typing.Union[typing.Tuple['Pet'], typing.List['Pet']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'SchemaFor200ResponseBodyApplicationJson': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + @dataclass class ApiResponseFor200(api_client.ApiResponse): diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py index 833f4da47a2..cc370df8749 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_find_by_tags/get.py @@ -36,6 +36,20 @@ class TagsSchema( class MetaOapg: items = schemas.StrSchema + + def __new__( + cls, + arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.items, str, ]], typing.List[typing.Union[MetaOapg.items, str, ]]], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'TagsSchema': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> MetaOapg.items: + return super().__getitem__(i) RequestRequiredQueryParams = typing.TypedDict( 'RequestRequiredQueryParams', { @@ -78,6 +92,20 @@ class SchemaFor200ResponseBodyApplicationXml( def items(cls) -> typing.Type['Pet']: return Pet + def __new__( + cls, + arg: typing.Union[typing.Tuple['Pet'], typing.List['Pet']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'SchemaFor200ResponseBodyApplicationXml': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + class SchemaFor200ResponseBodyApplicationJson( schemas.ListSchema @@ -91,6 +119,20 @@ class SchemaFor200ResponseBodyApplicationJson( def items(cls) -> typing.Type['Pet']: return Pet + def __new__( + cls, + arg: typing.Union[typing.Tuple['Pet'], typing.List['Pet']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'SchemaFor200ResponseBodyApplicationJson': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + @dataclass class ApiResponseFor200(api_client.ApiResponse): diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py index 1dfa529be4a..15034c003e0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_array/post.py @@ -41,6 +41,20 @@ class SchemaForRequestBodyApplicationJson( def items(cls) -> typing.Type['User']: return User + def __new__( + cls, + arg: typing.Union[typing.Tuple['User'], typing.List['User']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'SchemaForRequestBodyApplicationJson': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + request_body_user = api_client.RequestBody( content={ diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py index e2855aab8df..3ef1c9a134c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/user_create_with_list/post.py @@ -41,6 +41,20 @@ class SchemaForRequestBodyApplicationJson( def items(cls) -> typing.Type['User']: return User + def __new__( + cls, + arg: typing.Union[typing.Tuple['User'], typing.List['User']], + _configuration: typing.Optional[schemas.Configuration] = None, + ) -> 'SchemaForRequestBodyApplicationJson': + return super().__new__( + cls, + arg, + _configuration=_configuration, + ) + + def __getitem__(self, i) -> 'items': + return super().__getitem__(i) + request_body_user = api_client.RequestBody( content={ diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py index af2fea5fa59..20b8badb0b5 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py @@ -1519,11 +1519,12 @@ class DictBase(Discriminable, ValidatorBase): dict_items[property_name_js] = new_value return dict_items - def __setattr__(self, name, value): + def __setattr__(self, name: str, value: typing.Any): if not isinstance(self, FileIO): raise AttributeError('property setting not supported on immutable instances') - def __getattr__(self, name): + def __getattr__(self, name: str): + # for instance.name access if isinstance(self, frozendict): # if an attribute does not exist try: @@ -1532,13 +1533,6 @@ class DictBase(Discriminable, ValidatorBase): raise AttributeError(str(ex)) return super().__getattr__(self, name) - def __getattribute__(self, name): - # if an attribute does exist (for example as a class property but not as an instance method) - try: - return self[name] - except (KeyError, TypeError): - return super().__getattribute__(name) - def cast_to_allowed_types( arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict, list, tuple, bytes, Schema], @@ -1828,7 +1822,7 @@ class ListSchema( def _from_openapi_data(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[list, tuple], **kwargs: ValidationMetadata): + def __new__(cls, arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1843,7 +1837,7 @@ class NoneSchema( def _from_openapi_data(cls, arg: None, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: None, **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: None, **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1862,7 +1856,7 @@ class NumberSchema( def _from_openapi_data(cls, arg: typing.Union[int, float, decimal.Decimal], _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int, float], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1905,7 +1899,7 @@ class IntSchema(IntBase, NumberSchema): def _from_openapi_data(cls, arg: int, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[decimal.Decimal, int], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) @@ -1990,31 +1984,31 @@ class StrSchema( def _from_openapi_data(cls, arg: typing.Union[str], _configuration: typing.Optional[Configuration] = None) -> 'StrSchema': return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class UUIDSchema(UUIDBase, StrSchema): - def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, uuid.UUID], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DateSchema(DateBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DateTimeSchema(DateTimeBase, StrSchema): - def __new__(cls, arg: typing.Union[str, datetime], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str, datetime], **kwargs: Configuration): return super().__new__(cls, arg, **kwargs) class DecimalSchema(DecimalBase, StrSchema): - def __new__(cls, arg: typing.Union[str], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[str], **kwargs: Configuration): """ 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) @@ -2033,7 +2027,7 @@ class BytesSchema( """ this class will subclass bytes and is immutable """ - def __new__(cls, arg: typing.Union[bytes], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[bytes], **kwargs: Configuration): return super(Schema, cls).__new__(cls, arg) @@ -2058,7 +2052,7 @@ class FileSchema( - to be able to preserve file name info """ - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: Configuration): return super(Schema, cls).__new__(cls, arg) @@ -2078,7 +2072,7 @@ class BinarySchema( FileSchema, ] - def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: Configuration): return super().__new__(cls, arg) @@ -2093,7 +2087,7 @@ class BoolSchema( def _from_openapi_data(cls, arg: bool, _configuration: typing.Optional[Configuration] = None): return super()._from_openapi_data(arg, _configuration=_configuration) - def __new__(cls, arg: bool, **kwargs: typing.Union[ValidationMetadata]): + def __new__(cls, arg: bool, **kwargs: ValidationMetadata): return super().__new__(cls, arg, **kwargs) diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java index 89bd6f92883..784226b9f6f 100644 --- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java +++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java @@ -539,10 +539,10 @@ public interface PathHandlerInterface { *

Response headers: [CodegenProperty{openApiType='integer', baseName='X-Rate-Limit', complexType='null', getter='getxRateLimit', setter='setxRateLimit', description='calls per hour allowed by the user', dataType='Integer', datatypeWithEnum='Integer', dataFormat='int32', name='xRateLimit', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Rate-Limit;', baseType='Integer', containerType='null', title='null', unescapedDescription='calls per hour allowed by the user', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "integer", "format" : "int32" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when token expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when token expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ +}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isShort=true, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when token expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when token expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{ "type" : "string", "format" : "date-time" -}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null}]

+}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isShort=false, isLong=false, isUnboundedInteger=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isInnerEnum=false, isAnyType=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, uniqueItemsBoolean=null, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false, getHasRequired=false, getHasDiscriminatorWithNonEmptyMapping=false, composedSchemas=null, hasMultipleTypes=false, requiredVarsMap=null, ref=null, schemaIsFromAdditionalProperties=false}]

* *

Produces: [{mediaType=application/xml}, {mediaType=application/json}]

*

Returns: {@link String}