From a2054e1136c825edff7bdb82e0a5c151b781d93b Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Thu, 1 Sep 2022 17:41:01 -0700
Subject: [PATCH 01/30] Adds getters and setters for boolean schema true and
 false

---
 .../codegen/IJsonSchemaValidationProperties.java          | 8 ++++++++
 1 file changed, 8 insertions(+)

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 b4d37bf4ebd..33514f8d303 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,14 @@ public interface IJsonSchemaValidationProperties {
 
     void setHasMultipleTypes(boolean hasMultipleTypes);
 
+    boolean getIsBooleanSchemaTrue();
+
+    void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue);
+
+    boolean getIsBooleanSchemaFalse();
+
+    void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse);
+
     boolean getSchemaIsFromAdditionalProperties();
 
     void setSchemaIsFromAdditionalProperties(boolean schemaIsFromAdditionalProperties);
-- 
GitLab


From 407e51852370077df27f55b755da05cc056eb4dd Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Thu, 1 Sep 2022 17:46:33 -0700
Subject: [PATCH 02/30] Updates CodegenModel

---
 .../openapitools/codegen/CodegenModel.java    | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

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 68603130e24..40ef6fe3224 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
@@ -112,6 +112,8 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
     private boolean hasMultipleTypes = false;
     public HashMap<String, SchemaTestCase> testCases = new HashMap<>();
     private boolean schemaIsFromAdditionalProperties;
+    private boolean isBooleanSchemaTrue;
+    private boolean isBooleanSchemaFalse;
 
     /**
      * The type of the value for the additionalProperties keyword in the OAS document.
@@ -177,6 +179,26 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         this.additionalPropertiesType = additionalPropertiesType;
     }
 
+    @Override
+    public boolean getIsBooleanSchemaTrue() {
+        return isBooleanSchemaTrue;
+    }
+
+    @Override
+    public void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue) {
+        this.isBooleanSchemaTrue = isBooleanSchemaTrue;
+    }
+
+    @Override
+    public boolean getIsBooleanSchemaFalse() {
+        return isBooleanSchemaFalse;
+    }
+
+    @Override
+    public void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse) {
+        this.isBooleanSchemaFalse = isBooleanSchemaFalse;
+    }
+
     @Override
     public String getRef() {
         return ref;
@@ -957,6 +979,8 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 hasMultipleTypes == that.getHasMultipleTypes() &&
                 hasDiscriminatorWithNonEmptyMapping == that.getHasDiscriminatorWithNonEmptyMapping() &&
                 isUuid == that.getIsUuid() &&
+                isBooleanSchemaTrue == that.getIsBooleanSchemaTrue() &&
+                isBooleanSchemaFalse == that.getIsBooleanSchemaFalse() &&
                 getSchemaIsFromAdditionalProperties() == that.getSchemaIsFromAdditionalProperties() &&
                 getIsAnyType() == that.getIsAnyType() &&
                 getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
@@ -1039,7 +1063,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 getMaximum(), getPattern(), getMultipleOf(), getItems(), getAdditionalProperties(), getIsModel(),
                 getAdditionalPropertiesIsAnyType(), hasDiscriminatorWithNonEmptyMapping,
                 isAnyType, getComposedSchemas(), hasMultipleTypes, isDecimal, isUuid, requiredVarsMap, ref,
-                uniqueItemsBoolean, schemaIsFromAdditionalProperties);
+                uniqueItemsBoolean, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse);
     }
 
     @Override
@@ -1140,6 +1164,8 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         sb.append(", requiredVarsMap=").append(requiredVarsMap);
         sb.append(", ref=").append(ref);
         sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties);
+        sb.append(", isBooleanSchemaTrue=").append(isBooleanSchemaTrue);
+        sb.append(", isBooleanSchemaFalse=").append(isBooleanSchemaFalse);
         sb.append('}');
         return sb.toString();
     }
-- 
GitLab


From ff6c1077ca8d473d00fdba988b5de3a82c9e1c1a Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Thu, 1 Sep 2022 17:53:16 -0700
Subject: [PATCH 03/30] Updates codegenProperty

---
 .../openapitools/codegen/CodegenProperty.java | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

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 63681c93593..3aaadbc25e0 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
@@ -198,6 +198,28 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
     private Map<String, CodegenProperty> requiredVarsMap;
     private String ref;
     private boolean schemaIsFromAdditionalProperties;
+    private boolean isBooleanSchemaTrue;
+    private boolean isBooleanSchemaFalse;
+
+    @Override
+    public boolean getIsBooleanSchemaTrue() {
+        return isBooleanSchemaTrue;
+    }
+
+    @Override
+    public void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue) {
+        this.isBooleanSchemaTrue = isBooleanSchemaTrue;
+    }
+
+    @Override
+    public boolean getIsBooleanSchemaFalse() {
+        return isBooleanSchemaFalse;
+    }
+
+    @Override
+    public void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse) {
+        this.isBooleanSchemaFalse = isBooleanSchemaFalse;
+    }
 
     public String getBaseName() {
         return baseName;
@@ -1016,6 +1038,8 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
         sb.append(", requiredVarsMap=").append(requiredVarsMap);
         sb.append(", ref=").append(ref);
         sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties);
+        sb.append(", isBooleanSchemaTrue=").append(isBooleanSchemaTrue);
+        sb.append(", isBooleanSchemaFalse=").append(isBooleanSchemaFalse);
         sb.append('}');
         return sb.toString();
     }
@@ -1071,6 +1095,8 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
                 isNull == that.isNull &&
                 hasMultipleTypes == that.getHasMultipleTypes() &&
                 hasDiscriminatorWithNonEmptyMapping == that.hasDiscriminatorWithNonEmptyMapping &&
+                isBooleanSchemaTrue == that.getIsBooleanSchemaTrue() &&
+                isBooleanSchemaFalse == that.getIsBooleanSchemaFalse() &&
                 getSchemaIsFromAdditionalProperties() == that.getSchemaIsFromAdditionalProperties() &&
                 getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
                 getHasVars() == that.getHasVars() &&
@@ -1142,6 +1168,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, schemaIsFromAdditionalProperties);
+                ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse);
     }
 }
-- 
GitLab


From e0ac299dde1e7ea5611f9d30a17e4302ad3bca10 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Thu, 1 Sep 2022 18:01:00 -0700
Subject: [PATCH 04/30] Updates codegenparameter and codegenresponse

---
 .../codegen/CodegenParameter.java             | 20 +++++++++++++++++++
 .../openapitools/codegen/CodegenResponse.java | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+)

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 25f9295e7b2..23b39af6fe7 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
@@ -440,6 +440,26 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
         return sb.toString();
     }
 
+    // use schema.getIsBooleanSchemaTrue or content.mediaType.schema.getIsBooleanSchemaTrue instead of this
+    @Override
+    public boolean getIsBooleanSchemaTrue() {
+        return false;
+    }
+
+    // use schema.setIsBooleanSchemaTrue or content.mediaType.schema.setIsBooleanSchemaTrue instead of this
+    @Override
+    public void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue) {}
+
+    // use schema.getIsBooleanSchemaFalse or content.mediaType.schema.getIsBooleanSchemaFalse instead of this
+    @Override
+    public boolean getIsBooleanSchemaFalse() {
+        return false;
+    }
+
+    // use schema.setIsBooleanSchemaFalse or content.mediaType.schema.setIsBooleanSchemaFalse instead of this
+    @Override
+    public void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse) {}
+
     @Override
     public String getPattern() {
         return pattern;
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 6664334a0df..58dbd616375 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
@@ -189,6 +189,26 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
 
     }
 
+    // use content.mediaType.schema.getIsBooleanSchemaTrue instead of this
+    @Override
+    public boolean getIsBooleanSchemaTrue() {
+        return false;
+    }
+
+    // use content.mediaType.schema.setIsBooleanSchemaTrue instead of this
+    @Override
+    public void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue) {}
+
+    // use content.mediaType.schema.getIsBooleanSchemaFalse instead of this
+    @Override
+    public boolean getIsBooleanSchemaFalse() {
+        return false;
+    }
+
+    // use content.mediaType.schema.setIsBooleanSchemaFalse instead of this
+    @Override
+    public void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse) {}
+
     public LinkedHashMap<String, CodegenMediaType> getContent() {
         return content;
     }
-- 
GitLab


From 7cdd46a6806eda96f0e92ee6db71d107494f0170 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Thu, 1 Sep 2022 18:04:22 -0700
Subject: [PATCH 05/30] Adds comments describing the new properties

---
 .../openapitools/codegen/IJsonSchemaValidationProperties.java   | 2 ++
 1 file changed, 2 insertions(+)

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 33514f8d303..e3b41904e4a 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,10 +188,12 @@ public interface IJsonSchemaValidationProperties {
 
     void setHasMultipleTypes(boolean hasMultipleTypes);
 
+    // for when the schema is just the boolean true in a spec
     boolean getIsBooleanSchemaTrue();
 
     void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue);
 
+    // for when the schema is just the boolean false in a spec
     boolean getIsBooleanSchemaFalse();
 
     void setIsBooleanSchemaFalse(boolean isBooleanSchemaFalse);
-- 
GitLab


From eb7c204a97a5a76626533c12e28841740a3a9af7 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 10:50:39 -0700
Subject: [PATCH 06/30] Updates additionalProperty setting for
 python-experimental

---
 .../openapitools/codegen/CodegenProperty.java |  2 +-
 .../openapitools/codegen/DefaultCodegen.java  | 20 ++++++-
 .../PythonExperimentalClientCodegen.java      | 57 +++++++------------
 3 files changed, 41 insertions(+), 38 deletions(-)

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 3aaadbc25e0..cfc69072d11 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
@@ -208,7 +208,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
 
     @Override
     public void setIsBooleanSchemaTrue(boolean isBooleanSchemaTrue) {
-        this.isBooleanSchemaTrue = isBooleanSchemaTrue;
+        this.isBooleanSchemaTrue = true;
     }
 
     @Override
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 490ec670d6f..517e7a207ba 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
@@ -92,6 +92,8 @@ public class DefaultCodegen implements CodegenConfig {
     private static Cache<SanitizeNameOptions, String> sanitizedNameCache;
     private static final String xSchemaTestExamplesKey = "x-schema-test-examples";
     private static final String xSchemaTestExamplesRefPrefix = "#/components/x-schema-test-examples/";
+    protected static Schema falseSchema;
+    protected static Schema trueSchema = new Schema();
 
     static {
         DefaultFeatureSet = FeatureSet.newBuilder()
@@ -144,6 +146,8 @@ public class DefaultCodegen implements CodegenConfig {
                 .expireAfterAccess(cacheExpiry, TimeUnit.SECONDS)
                 .ticker(Ticker.systemTicker())
                 .build();
+        falseSchema = new Schema();
+        falseSchema.setNot(new Schema());
     }
 
     protected GeneratorMetadata generatorMetadata;
@@ -2796,6 +2800,12 @@ public class DefaultCodegen implements CodegenConfig {
             typeAliases = getAllAliases(allDefinitions);
         }
 
+        CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
+        if (schema.equals(trueSchema)) {
+            m.setIsBooleanSchemaTrue(true);
+        } else if (schema.equals(falseSchema)) {
+            m.setIsBooleanSchemaTrue(true);
+        }
         // unalias schema
         schema = unaliasSchema(schema);
         if (schema == null) {
@@ -2803,7 +2813,6 @@ public class DefaultCodegen implements CodegenConfig {
             return null;
         }
 
-        CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
         ModelUtils.syncValidationProperties(schema, m);
         if (openAPI != null) {
             HashMap<String, SchemaTestCase> schemaTestCases = extractSchemaTestCases(xSchemaTestExamplesRefPrefix + name);
@@ -3621,10 +3630,17 @@ public class DefaultCodegen implements CodegenConfig {
             LOGGER.debug("Cached fromProperty for {} : {} required={}", name, p.getName(), required);
             return cpc;
         }
+
+        CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
+        if (p.equals(trueSchema)) {
+            property.setIsBooleanSchemaTrue(true);
+        } else if (p.equals(falseSchema)) {
+            property.setIsBooleanSchemaTrue(true);
+        }
+
         // unalias schema
         p = unaliasSchema(p);
 
-        CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
         property.setSchemaIsFromAdditionalProperties(schemaIsFromAdditionalProperties);
         property.required = required;
         ModelUtils.syncValidationProperties(p, property);
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 0ca4e4e5eb5..396867560d8 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
@@ -2227,50 +2227,37 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
         return modelNameToSchemaCache;
     }
 
+    /**
+     * Use cases:
+     * additional properties is unset: do nothing
+     * additional properties is true: add definiton to property
+     * additional properties is false: add definiton to property
+     * additional properties is schema: add definiton to property
+     *
+     * @param schema the schema that may contain an additional property schema
+     * @param property the property for the above schema
+     */
     @Override
     protected void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
-        if (schema.equals(new Schema())) {
-            // if we are trying to set additionalProperties on an empty schema stop recursing
+        if (schema.getAdditionalProperties() == null) {
             return;
         }
-        boolean additionalPropertiesIsAnyType = false;
-        CodegenModel m = null;
-        if (property instanceof CodegenModel) {
-            m = (CodegenModel) property;
-        }
-        CodegenProperty addPropProp = null;
-        boolean isAdditionalPropertiesTrue = false;
-        if (schema.getAdditionalProperties() == null) {
-            if (!disallowAdditionalPropertiesIfNotPresent) {
-                isAdditionalPropertiesTrue = true;
-                addPropProp = fromProperty("",  new Schema());
-                addPropProp.nameInSnakeCase = null;
-                additionalPropertiesIsAnyType = true;
-            }
-        } else if (schema.getAdditionalProperties() instanceof Boolean) {
+        CodegenProperty addPropProp;
+        if (schema.getAdditionalProperties() instanceof Boolean) {
             if (Boolean.TRUE.equals(schema.getAdditionalProperties())) {
-                isAdditionalPropertiesTrue = true;
-                addPropProp = fromProperty("",  new Schema());
+                addPropProp = fromProperty("",  trueSchema);
                 addPropProp.nameInSnakeCase = null;
-                additionalPropertiesIsAnyType = true;
+                property.setAdditionalProperties(addPropProp);
+            } else if (Boolean.FALSE.equals(schema.getAdditionalProperties())) {
+                // false is equivalent to not AnyType
+                addPropProp = fromProperty("",  falseSchema);
+                addPropProp.nameInSnakeCase = null;
+                property.setAdditionalProperties(addPropProp);
             }
         } else {
-            addPropProp = fromProperty("", (Schema) schema.getAdditionalProperties());
+            Schema addPropsSchema = (Schema) schema.getAdditionalProperties();
+            addPropProp = fromProperty("", addPropsSchema);
             addPropProp.nameInSnakeCase = null;
-            if (isAnyTypeSchema((Schema) schema.getAdditionalProperties())) {
-                additionalPropertiesIsAnyType = true;
-            }
-        }
-        if (additionalPropertiesIsAnyType) {
-            property.setAdditionalPropertiesIsAnyType(true);
-        }
-        if (m != null && isAdditionalPropertiesTrue) {
-            m.isAdditionalPropertiesTrue = true;
-        }
-        if (ModelUtils.isComposedSchema(schema) && !supportsAdditionalPropertiesWithComposedSchema) {
-            return;
-        }
-        if (addPropProp != null) {
             property.setAdditionalProperties(addPropProp);
         }
     }
-- 
GitLab


From 329a10d31814dc4f48bd79a2bad1c73ac6279ffc Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 10:57:01 -0700
Subject: [PATCH 07/30] Sample regenerated

---
 .../.openapi-generator/VERSION                |   2 +-
 .../docs/apis/tags/DefaultApi.md              |   1 -
 .../docs/apis/tags/FakeApi.md                 |  30 ++---
 .../docs/apis/tags/PetApi.md                  |   3 -
 .../docs/models/AdditionalPropertiesClass.md  |   1 -
 .../python-experimental/docs/models/Animal.md |   1 -
 .../docs/models/AnyTypeNotString.md           |   7 +-
 .../docs/models/ApiResponse.md                |   1 -
 .../python-experimental/docs/models/Apple.md  |   1 -
 .../docs/models/AppleReq.md                   |   1 +
 .../docs/models/ArrayOfArrayOfNumberOnly.md   |   1 -
 .../docs/models/ArrayOfNumberOnly.md          |   1 -
 .../docs/models/ArrayTest.md                  |   1 -
 .../python-experimental/docs/models/Banana.md |   1 -
 .../docs/models/BananaReq.md                  |   1 +
 .../docs/models/BasquePig.md                  |   1 -
 .../docs/models/Capitalization.md             |   1 -
 .../python-experimental/docs/models/Cat.md    |   7 +-
 .../docs/models/Category.md                   |   1 -
 .../docs/models/ChildCat.md                   |   7 +-
 .../docs/models/ClassModel.md                 |   1 -
 .../python-experimental/docs/models/Client.md |   1 -
 .../docs/models/ComplexQuadrilateral.md       |   7 +-
 ...omposedAnyOfDifferentTypesNoValidations.md |   7 +-
 .../docs/models/ComposedObject.md             |   7 +-
 .../models/ComposedOneOfDifferentTypes.md     |   7 +-
 .../docs/models/DanishPig.md                  |   1 -
 .../python-experimental/docs/models/Dog.md    |   7 +-
 .../docs/models/EnumArrays.md                 |   1 -
 .../docs/models/EnumTest.md                   |   1 -
 .../docs/models/EquilateralTriangle.md        |   7 +-
 .../python-experimental/docs/models/File.md   |   1 -
 .../docs/models/FileSchemaTestClass.md        |   1 -
 .../python-experimental/docs/models/Foo.md    |   1 -
 .../docs/models/FormatTest.md                 |   1 -
 .../python-experimental/docs/models/Fruit.md  |   1 -
 .../docs/models/FruitReq.md                   |   7 +-
 .../docs/models/GmFruit.md                    |   1 -
 .../docs/models/GrandparentAnimal.md          |   1 -
 .../docs/models/HasOnlyReadOnly.md            |   1 -
 .../docs/models/HealthCheckResult.md          |   1 -
 .../docs/models/IsoscelesTriangle.md          |   7 +-
 .../python-experimental/docs/models/Mammal.md |   7 +-
 .../docs/models/MapTest.md                    |   1 -
 ...dPropertiesAndAdditionalPropertiesClass.md |   1 -
 .../docs/models/Model200Response.md           |   1 -
 .../docs/models/ModelReturn.md                |   1 -
 .../python-experimental/docs/models/Money.md  |   1 -
 .../python-experimental/docs/models/Name.md   |   1 -
 .../docs/models/NoAdditionalProperties.md     |   1 +
 .../docs/models/NullableShape.md              |   7 +-
 .../docs/models/NumberOnly.md                 |   1 -
 .../docs/models/ObjectInterface.md            |   7 +-
 .../docs/models/ObjectModelWithRefProps.md    |   1 -
 .../models/ObjectWithDecimalProperties.md     |   1 -
 .../models/ObjectWithDifficultlyNamedProps.md |   1 -
 .../ObjectWithInlineCompositionProperty.md    |   1 -
 .../docs/models/ObjectWithValidations.md      |   7 +-
 .../python-experimental/docs/models/Order.md  |   1 -
 .../docs/models/ParentPet.md                  |   7 +-
 .../python-experimental/docs/models/Pet.md    |   1 -
 .../python-experimental/docs/models/Pig.md    |   7 +-
 .../python-experimental/docs/models/Player.md |   1 -
 .../docs/models/Quadrilateral.md              |   7 +-
 .../docs/models/QuadrilateralInterface.md     |   1 -
 .../docs/models/ReadOnlyFirst.md              |   1 -
 .../docs/models/ScaleneTriangle.md            |   7 +-
 .../python-experimental/docs/models/Shape.md  |   7 +-
 .../docs/models/ShapeOrNull.md                |   7 +-
 .../docs/models/SimpleQuadrilateral.md        |   7 +-
 .../docs/models/SomeObject.md                 |   7 +-
 .../docs/models/SpecialModelName.md           |   1 -
 .../python-experimental/docs/models/Tag.md    |   1 -
 .../docs/models/Triangle.md                   |   7 +-
 .../docs/models/TriangleInterface.md          |   1 -
 .../python-experimental/docs/models/User.md   |   1 -
 .../python-experimental/docs/models/Whale.md  |   1 -
 .../model/additional_properties_class.py      | 118 ++++++++++++++++--
 .../model/additional_properties_class.pyi     | 118 ++++++++++++++++--
 .../petstore_api/model/animal.py              |  10 +-
 .../petstore_api/model/animal.pyi             |  10 +-
 .../petstore_api/model/any_type_not_string.py |  13 +-
 .../model/any_type_not_string.pyi             |  13 +-
 .../petstore_api/model/api_response.py        |  10 +-
 .../petstore_api/model/api_response.pyi       |  10 +-
 .../petstore_api/model/apple.py               |  10 +-
 .../petstore_api/model/apple.pyi              |  10 +-
 .../petstore_api/model/apple_req.py           |  31 ++++-
 .../petstore_api/model/apple_req.pyi          |  31 ++++-
 .../model/array_of_array_of_number_only.py    |  10 +-
 .../model/array_of_array_of_number_only.pyi   |  10 +-
 .../model/array_of_number_only.py             |  10 +-
 .../model/array_of_number_only.pyi            |  10 +-
 .../petstore_api/model/array_test.py          |  10 +-
 .../petstore_api/model/array_test.pyi         |  10 +-
 .../petstore_api/model/banana.py              |  10 +-
 .../petstore_api/model/banana.pyi             |  10 +-
 .../petstore_api/model/banana_req.py          |  31 ++++-
 .../petstore_api/model/banana_req.pyi         |  31 ++++-
 .../petstore_api/model/basque_pig.py          |  10 +-
 .../petstore_api/model/basque_pig.pyi         |  10 +-
 .../petstore_api/model/capitalization.py      |  10 +-
 .../petstore_api/model/capitalization.pyi     |  10 +-
 .../petstore_api/model/cat.py                 |  23 +---
 .../petstore_api/model/cat.pyi                |  23 +---
 .../petstore_api/model/category.py            |  10 +-
 .../petstore_api/model/category.pyi           |  10 +-
 .../petstore_api/model/child_cat.py           |  23 +---
 .../petstore_api/model/child_cat.pyi          |  23 +---
 .../petstore_api/model/class_model.py         |  10 +-
 .../petstore_api/model/class_model.pyi        |  10 +-
 .../petstore_api/model/client.py              |  10 +-
 .../petstore_api/model/client.pyi             |  10 +-
 .../model/complex_quadrilateral.py            |  23 +---
 .../model/complex_quadrilateral.pyi           |  23 +---
 ...d_any_of_different_types_no_validations.py |  55 +++++---
 ..._any_of_different_types_no_validations.pyi |  55 +++++---
 .../petstore_api/model/composed_object.py     |  13 +-
 .../petstore_api/model/composed_object.pyi    |  13 +-
 .../model/composed_one_of_different_types.py  |  26 +---
 .../model/composed_one_of_different_types.pyi |  26 +---
 .../petstore_api/model/danish_pig.py          |  10 +-
 .../petstore_api/model/danish_pig.pyi         |  10 +-
 .../petstore_api/model/dog.py                 |  23 +---
 .../petstore_api/model/dog.pyi                |  23 +---
 .../petstore_api/model/enum_arrays.py         |  10 +-
 .../petstore_api/model/enum_arrays.pyi        |  10 +-
 .../petstore_api/model/enum_test.py           |  10 +-
 .../petstore_api/model/enum_test.pyi          |  10 +-
 .../model/equilateral_triangle.py             |  23 +---
 .../model/equilateral_triangle.pyi            |  23 +---
 .../petstore_api/model/file.py                |  10 +-
 .../petstore_api/model/file.pyi               |  10 +-
 .../model/file_schema_test_class.py           |  10 +-
 .../model/file_schema_test_class.pyi          |  10 +-
 .../petstore_api/model/foo.py                 |  10 +-
 .../petstore_api/model/foo.pyi                |  10 +-
 .../petstore_api/model/format_test.py         |  18 ++-
 .../petstore_api/model/format_test.pyi        |  18 ++-
 .../petstore_api/model/fruit.py               |  10 +-
 .../petstore_api/model/fruit.pyi              |  10 +-
 .../petstore_api/model/fruit_req.py           |  13 +-
 .../petstore_api/model/fruit_req.pyi          |  13 +-
 .../petstore_api/model/gm_fruit.py            |  10 +-
 .../petstore_api/model/gm_fruit.pyi           |  10 +-
 .../petstore_api/model/grandparent_animal.py  |  10 +-
 .../petstore_api/model/grandparent_animal.pyi |  10 +-
 .../petstore_api/model/has_only_read_only.py  |  10 +-
 .../petstore_api/model/has_only_read_only.pyi |  10 +-
 .../petstore_api/model/health_check_result.py |  10 +-
 .../model/health_check_result.pyi             |  10 +-
 .../petstore_api/model/isosceles_triangle.py  |  23 +---
 .../petstore_api/model/isosceles_triangle.pyi |  23 +---
 .../petstore_api/model/mammal.py              |  13 +-
 .../petstore_api/model/mammal.pyi             |  13 +-
 .../petstore_api/model/map_test.py            |  10 +-
 .../petstore_api/model/map_test.pyi           |  10 +-
 ...perties_and_additional_properties_class.py |  10 +-
 ...erties_and_additional_properties_class.pyi |  10 +-
 .../petstore_api/model/model200_response.py   |  10 +-
 .../petstore_api/model/model200_response.pyi  |  10 +-
 .../petstore_api/model/model_return.py        |  10 +-
 .../petstore_api/model/model_return.pyi       |  10 +-
 .../petstore_api/model/money.py               |  10 +-
 .../petstore_api/model/money.pyi              |  10 +-
 .../petstore_api/model/name.py                |  10 +-
 .../petstore_api/model/name.pyi               |  10 +-
 .../model/no_additional_properties.py         |  31 ++++-
 .../model/no_additional_properties.pyi        |  31 ++++-
 .../petstore_api/model/nullable_class.py      | 115 ++++++++---------
 .../petstore_api/model/nullable_class.pyi     | 115 ++++++++---------
 .../petstore_api/model/nullable_shape.py      |  13 +-
 .../petstore_api/model/nullable_shape.pyi     |  13 +-
 .../petstore_api/model/number_only.py         |  10 +-
 .../petstore_api/model/number_only.pyi        |  10 +-
 .../petstore_api/model/object_interface.py    |  26 +++-
 .../petstore_api/model/object_interface.pyi   |  26 +++-
 .../model/object_model_with_ref_props.py      |  10 +-
 .../model/object_model_with_ref_props.pyi     |  10 +-
 .../model/object_with_decimal_properties.py   |  10 +-
 .../model/object_with_decimal_properties.pyi  |  10 +-
 .../object_with_difficultly_named_props.py    |  10 +-
 .../object_with_difficultly_named_props.pyi   |  10 +-
 ...object_with_inline_composition_property.py |  23 +---
 ...bject_with_inline_composition_property.pyi |  23 +---
 .../model/object_with_validations.py          |  13 +-
 .../model/object_with_validations.pyi         |  13 +-
 .../petstore_api/model/order.py               |  10 +-
 .../petstore_api/model/order.pyi              |  10 +-
 .../petstore_api/model/parent_pet.py          |  13 +-
 .../petstore_api/model/parent_pet.pyi         |  13 +-
 .../petstore_api/model/pet.py                 |  14 +--
 .../petstore_api/model/pet.pyi                |  14 +--
 .../petstore_api/model/pig.py                 |  13 +-
 .../petstore_api/model/pig.pyi                |  13 +-
 .../petstore_api/model/player.py              |  10 +-
 .../petstore_api/model/player.pyi             |  10 +-
 .../petstore_api/model/quadrilateral.py       |  13 +-
 .../petstore_api/model/quadrilateral.pyi      |  13 +-
 .../model/quadrilateral_interface.py          |  10 +-
 .../model/quadrilateral_interface.pyi         |  10 +-
 .../petstore_api/model/read_only_first.py     |  10 +-
 .../petstore_api/model/read_only_first.pyi    |  10 +-
 .../petstore_api/model/scalene_triangle.py    |  23 +---
 .../petstore_api/model/scalene_triangle.pyi   |  23 +---
 .../petstore_api/model/shape.py               |  13 +-
 .../petstore_api/model/shape.pyi              |  13 +-
 .../petstore_api/model/shape_or_null.py       |  13 +-
 .../petstore_api/model/shape_or_null.pyi      |  13 +-
 .../model/simple_quadrilateral.py             |  23 +---
 .../model/simple_quadrilateral.pyi            |  23 +---
 .../petstore_api/model/some_object.py         |  13 +-
 .../petstore_api/model/some_object.pyi        |  13 +-
 .../petstore_api/model/special_model_name.py  |  10 +-
 .../petstore_api/model/special_model_name.pyi |  10 +-
 .../petstore_api/model/tag.py                 |  10 +-
 .../petstore_api/model/tag.pyi                |  10 +-
 .../petstore_api/model/triangle.py            |  13 +-
 .../petstore_api/model/triangle.pyi           |  13 +-
 .../petstore_api/model/triangle_interface.py  |  10 +-
 .../petstore_api/model/triangle_interface.pyi |  10 +-
 .../petstore_api/model/user.py                |  59 ++++-----
 .../petstore_api/model/user.pyi               |  59 ++++-----
 .../petstore_api/model/whale.py               |  10 +-
 .../petstore_api/model/whale.pyi              |  10 +-
 .../petstore_api/paths/fake_1/post.py         |  28 ++---
 .../petstore_api/paths/fake_1/post.pyi        |  28 ++---
 .../petstore_api/paths/fake_2/get.py          |  10 +-
 .../petstore_api/paths/fake_2/get.pyi         |  10 +-
 .../paths/fake_inline_composition_/post.py    | 108 +++-------------
 .../paths/fake_inline_composition_/post.pyi   | 108 +++-------------
 .../paths/fake_json_form_data/get.py          |  10 +-
 .../paths/fake_json_form_data/get.pyi         |  10 +-
 .../paths/fake_obj_in_query/get.py            |  10 +-
 .../paths/fake_obj_in_query/get.pyi           |  10 +-
 .../post.py                                   |  12 +-
 .../post.pyi                                  |  12 +-
 .../paths/fake_upload_file/post.py            |  12 +-
 .../paths/fake_upload_file/post.pyi           |  12 +-
 .../paths/fake_upload_files/post.py           |  10 +-
 .../paths/fake_upload_files/post.pyi          |  10 +-
 .../petstore_api/paths/foo/get.py             |  10 +-
 .../petstore_api/paths/foo/get.pyi            |  10 +-
 .../petstore_api/paths/pet_pet_id_3/post.py   |  10 +-
 .../petstore_api/paths/pet_pet_id_3/post.pyi  |  10 +-
 .../paths/pet_pet_id_upload_image/post.py     |  10 +-
 .../paths/pet_pet_id_upload_image/post.pyi    |  10 +-
 247 files changed, 1233 insertions(+), 2100 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
index 66672d4e9d3..717311e32e3 100644
--- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
@@ -1 +1 @@
-6.1.0-SNAPSHOT
\ No newline at end of file
+unset
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md
index a4f6e3db255..72b1215aaa9 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md
@@ -61,7 +61,6 @@ headers | Unset | headers were not defined |
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **string** | [**Foo**](Foo.md) |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 
 **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md
index e79f69d9f9d..23bf896e008 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md
@@ -1019,7 +1019,6 @@ Name | Type | Description | Notes
 **dateTime** | **datetime** | None | [optional]  if omitted the server will use the default value of 2010-02-01T10:20:10.11111+01:00
 **password** | **str** | None | [optional] 
 **callback** | **str** | None | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -1129,7 +1128,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_form_string_array** | **[str]** | Form parameter enum test (string array) | [optional] 
 **enum_form_string** | **str** | Form parameter enum test (string) | [optional]  if omitted the server will use the default value of "-efg"
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### query_params
 #### RequestQueryParams
@@ -1575,10 +1573,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 #### SchemaForRequestBodyMultipartFormData
 
@@ -1586,7 +1583,6 @@ Name | Type | Description | Notes
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### query_params
 #### RequestQueryParams
@@ -1599,10 +1595,9 @@ compositionInProperty | CompositionInPropertySchema | | optional
 
 #### CompositionAtRootSchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 #### CompositionInPropertySchema
 
@@ -1610,7 +1605,6 @@ Name | Type | Description | Notes
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -1628,10 +1622,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 #### SchemaFor200ResponseBodyMultipartFormData
 
@@ -1639,7 +1632,6 @@ Name | Type | Description | Notes
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -1705,7 +1697,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **param** | **str** | field1 | 
 **param2** | **str** | field2 | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -2044,7 +2035,6 @@ mapBean | MapBeanSchema | | optional
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **keyword** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -3042,7 +3032,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | **file_type** | file to upload | 
 **additionalMetadata** | **str** | Additional data to pass to server | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -3131,7 +3120,6 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **files** | **[file_type]** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md
index d4820de6abf..aaf7662f456 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md
@@ -1070,7 +1070,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** | Updated name of the pet | [optional] 
 **status** | **str** | Updated status of the pet | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### path_params
 #### RequestPathParams
@@ -1195,7 +1194,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **requiredFile** | **file_type** | file to upload | 
 **additionalMetadata** | **str** | Additional data to pass to server | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### path_params
 #### RequestPathParams
@@ -1326,7 +1324,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **additionalMetadata** | **str** | Additional data to pass to server | [optional] 
 **file** | **file_type** | file to upload | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 ### path_params
 #### RequestPathParams
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md
index 4a27d5e6f32..a1976eb18d8 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md
@@ -11,7 +11,6 @@ Name | Type | Description | Notes
 **map_with_undeclared_properties_anytype_3** | **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | [optional] 
 **empty_map** | **{str: typing.Any}** | an object with no declared properties and no undeclared properties, hence it&#x27;s an empty map. | [optional] 
 **map_with_undeclared_properties_string** | **{str: (str,)}** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md
index 5b533c3b4de..f9f309c5dd6 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
 **color** | **str** |  | [optional]  if omitted the server will use the default value of "red"
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AnyTypeNotString.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AnyTypeNotString.md
index e082fc84b29..041d99a7a50 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AnyTypeNotString.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AnyTypeNotString.md
@@ -1,9 +1,8 @@
 # petstore_api.model.any_type_not_string.AnyTypeNotString
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/ApiResponse.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md
index 6dff2b638a5..2b1bdb939b5 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md
@@ -6,7 +6,6 @@ Name | Type | Description | Notes
 **code** | **int** |  | [optional] 
 **type** | **str** |  | [optional] 
 **message** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md
index 8cec4fd3d73..58638f1d910 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cultivar** | **str** |  | 
 **origin** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
index 17b7d6db227..f34960428ce 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cultivar** | **str** |  | 
 **mealy** | **bool** |  | [optional] 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md
index db5631da845..25953f6b1bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ArrayArrayNumber** | **[[int, float]]** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md
index 65024e3fb6d..58174858bd3 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ArrayNumber** | **[int, float]** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md
index 9ad473d1c14..8490ba34a9f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md
@@ -6,7 +6,6 @@ Name | Type | Description | Notes
 **array_of_string** | **[str]** |  | [optional] 
 **array_array_of_integer** | **[[int]]** |  | [optional] 
 **array_array_of_model** | **[[ReadOnlyFirst]]** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md
index 526601c94e1..be4f1e6383c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **lengthCm** | **int, float** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
index a386d04fd26..93b3b9f0123 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **lengthCm** | **int, float** |  | 
 **sweet** | **bool** |  | [optional] 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md b/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md
index 0243b748258..c91310c1ebb 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md
index 1608508fc18..b769e0ff179 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md
@@ -9,7 +9,6 @@ Name | Type | Description | Notes
 **Capital_Snake** | **str** |  | [optional] 
 **SCA_ETH_Flow_Points** | **str** |  | [optional] 
 **ATT_NAME** | **str** | Name of the pet  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Cat.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Cat.md
index 9a3329ce0eb..4ed839a95ef 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Cat.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Cat.md
@@ -1,9 +1,8 @@
 # petstore_api.model.cat.Cat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/Category.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md
index 609dc7536a2..13120c93bb7 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** |  |  if omitted the server will use the default value of "default-name"
 **id** | **int** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ChildCat.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ChildCat.md
index 6c71cb91b78..84a42c1ab12 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ChildCat.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ChildCat.md
@@ -1,9 +1,8 @@
 # petstore_api.model.child_cat.ChildCat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/ClassModel.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md
index 8443e5ee4d2..ecdae32b428 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md
@@ -6,7 +6,6 @@ Model for testing model with \"_class\" property
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **_class** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md
index c8e6d578c52..29d16e55dfd 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **client** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ComplexQuadrilateral.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ComplexQuadrilateral.md
index 9468c5395cc..2f3f68cc110 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ComplexQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ComplexQuadrilateral.md
@@ -1,9 +1,8 @@
 # petstore_api.model.complex_quadrilateral.ComplexQuadrilateral
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/ComposedAnyOfDifferentTypesNoValidations.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedAnyOfDifferentTypesNoValidations.md
index 2ee97afba6d..5503fd23344 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedAnyOfDifferentTypesNoValidations.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedAnyOfDifferentTypesNoValidations.md
@@ -1,9 +1,8 @@
 # petstore_api.model.composed_any_of_different_types_no_validations.ComposedAnyOfDifferentTypesNoValidations
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/ComposedObject.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedObject.md
index e98f75ebe9c..74e7e988c1d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedObject.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedObject.md
@@ -1,9 +1,8 @@
 # petstore_api.model.composed_object.ComposedObject
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**object** |  | 
 
 [[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/docs/models/ComposedOneOfDifferentTypes.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedOneOfDifferentTypes.md
index 335e2cc8e3a..9621b64ec6a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedOneOfDifferentTypes.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ComposedOneOfDifferentTypes.md
@@ -2,10 +2,9 @@
 
 this is a model that allows payloads of type object or number
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/DanishPig.md b/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md
index 6a6f1ffd81b..2d4a85fc658 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Dog.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Dog.md
index ff193680f7b..cde3c09449c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Dog.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Dog.md
@@ -1,9 +1,8 @@
 # petstore_api.model.dog.Dog
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/EnumArrays.md b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md
index 6016f8f6728..7e22b7032e0 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **just_symbol** | **str** |  | [optional] 
 **array_enum** | **[str]** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md
index b6e4302edfc..833a60e016c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md
@@ -12,7 +12,6 @@ Name | Type | Description | Notes
 **StringEnumWithDefaultValue** | [**StringEnumWithDefaultValue**](StringEnumWithDefaultValue.md) |  | [optional] 
 **IntegerEnumWithDefaultValue** | [**IntegerEnumWithDefaultValue**](IntegerEnumWithDefaultValue.md) |  | [optional] 
 **IntegerEnumOneValue** | [**IntegerEnumOneValue**](IntegerEnumOneValue.md) |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/EquilateralTriangle.md b/samples/openapi3/client/petstore/python-experimental/docs/models/EquilateralTriangle.md
index 42d3a18be6b..3678c46253d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/EquilateralTriangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/EquilateralTriangle.md
@@ -1,9 +1,8 @@
 # petstore_api.model.equilateral_triangle.EquilateralTriangle
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/File.md b/samples/openapi3/client/petstore/python-experimental/docs/models/File.md
index 8568e143879..3077ae9d9f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/File.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/File.md
@@ -6,7 +6,6 @@ Must be named `File` for test.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **sourceURI** | **str** | Test capitalization | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md
index aa5299566f8..9494c5a020a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**File**](File.md) |  | [optional] 
 **files** | **[File]** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md
index 1cd90349bbf..9d5e6c9f2a3 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional]  if omitted the server will use the default value of "bar"
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md
index 5b9e7ad4ce1..6116e1a5e4f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md
@@ -24,7 +24,6 @@ Name | Type | Description | Notes
 **pattern_with_digits** | **str** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **pattern_with_digits_and_delimiter** | **str** | A string starting with &#x27;image_&#x27; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
 **noneProp** | **none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md
index 3dc06819869..82f2cb9f096 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **color** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/FruitReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/FruitReq.md
index 598c739ef6d..8fe19d445e3 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/FruitReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/FruitReq.md
@@ -1,9 +1,8 @@
 # petstore_api.model.fruit_req.FruitReq
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/GmFruit.md b/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md
index b2193da2f37..1ad632ec0ab 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **color** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md b/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md
index dd3214026af..698c8efdea7 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **pet_type** | **str** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md
index 5ff085088e1..a7b7af3cfa2 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional] [readonly] 
 **foo** | **str** |  | [optional] [readonly] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md b/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md
index 79abeef6c43..f049f0c4e9f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md
@@ -6,7 +6,6 @@ Just a string to inform instance is up and running. Make it nullable in hope to
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NullableMessage** | **str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/IsoscelesTriangle.md b/samples/openapi3/client/petstore/python-experimental/docs/models/IsoscelesTriangle.md
index 1494ffa9264..18c999110bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/IsoscelesTriangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/IsoscelesTriangle.md
@@ -1,9 +1,8 @@
 # petstore_api.model.isosceles_triangle.IsoscelesTriangle
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/Mammal.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Mammal.md
index e3f0abf85c2..fd8ba77c004 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Mammal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Mammal.md
@@ -1,9 +1,8 @@
 # petstore_api.model.mammal.Mammal
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/MapTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md
index ce2681db396..ef1f3682cd1 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md
@@ -7,7 +7,6 @@ Name | Type | Description | Notes
 **map_of_enum_string** | **{str: (str,)}** |  | [optional] 
 **direct_map** | **{str: (bool,)}** |  | [optional] 
 **indirect_map** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 5b31f665043..c04421a6fb9 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -6,7 +6,6 @@ Name | Type | Description | Notes
 **uuid** | **str** |  | [optional] 
 **dateTime** | **datetime** |  | [optional] 
 **map** | **{str: (Animal,)}** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md
index a17a63a5ca3..b8b38b7c65f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md
@@ -7,7 +7,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **int** |  | [optional] 
 **class** | **str** | this is a reserved python keyword | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md
index 0ecd82295e2..30575f76574 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md
@@ -6,7 +6,6 @@ Model for testing reserved words
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **return** | **int** | this is a reserved python keyword | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md
index df1dd4d4a61..5c7bd4efde2 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **amount** | **str** |  | 
 **currency** | [**Currency**](Currency.md) |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md
index d26590ca667..424366318d5 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md
@@ -8,7 +8,6 @@ Name | Type | Description | Notes
 **name** | **int** |  | 
 **snake_case** | **int** |  | [optional] [readonly] 
 **property** | **str** | this is a reserved python keyword | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
index 0f916cd6d88..682eeb27fe9 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **int** |  | 
 **petId** | **int** |  | [optional] 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/NullableShape.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NullableShape.md
index 6ed366039d3..76f29c8a419 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NullableShape.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NullableShape.md
@@ -2,10 +2,9 @@
 
 The value may be a shape or the 'null' value. For a composed schema to validate a null payload, one of its chosen oneOf schemas must be type null or nullable (introduced in OAS schema >= 3.0)
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/NumberOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md
index 42aacbb8c50..a901bfeb0fd 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustNumber** | **int, float** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectInterface.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectInterface.md
index 01e097353b0..0a722a18b54 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectInterface.md
@@ -1,9 +1,8 @@
 # petstore_api.model.object_interface.ObjectInterface
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**object** |  | 
 
 [[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/docs/models/ObjectModelWithRefProps.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md
index bc0d88a66c8..3f6cca02481 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md
@@ -8,7 +8,6 @@ Name | Type | Description | Notes
 **myNumber** | [**NumberWithValidations**](NumberWithValidations.md) |  | [optional] 
 **myString** | **str** |  | [optional] 
 **myBoolean** | **bool** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md
index 80ee2b44890..4f35ddc82e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md
@@ -6,7 +6,6 @@ Name | Type | Description | Notes
 **length** | **str** |  | [optional] 
 **width** | **str** |  | [optional] 
 **cost** | [**Money**](Money.md) |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md
index 9382861b9ec..a0d330931be 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md
@@ -8,7 +8,6 @@ Name | Type | Description | Notes
 **123-list** | **str** |  | 
 **$special[property.name]** | **int** |  | [optional] 
 **123Number** | **int** |  | [optional] [readonly] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md
index 0a2eb6b8c3e..a7e3d603daa 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md
@@ -4,7 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithValidations.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithValidations.md
index b147d87635c..4aa75a5bbf2 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithValidations.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithValidations.md
@@ -1,9 +1,8 @@
 # petstore_api.model.object_with_validations.ObjectWithValidations
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**object** |  | 
 
 [[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/docs/models/Order.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md
index 8fd76516383..2126f211eee 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md
@@ -9,7 +9,6 @@ Name | Type | Description | Notes
 **shipDate** | **datetime** |  | [optional] 
 **status** | **str** | Order Status | [optional] 
 **complete** | **bool** |  | [optional]  if omitted the server will use the default value of False
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ParentPet.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ParentPet.md
index 012707e60ea..ed9ce86c7e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ParentPet.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ParentPet.md
@@ -1,9 +1,8 @@
 # petstore_api.model.parent_pet.ParentPet
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**object** |  | 
 
 [[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/docs/models/Pet.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md
index 5449d61dc21..08c682639df 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md
@@ -11,7 +11,6 @@ Name | Type | Description | Notes
 **category** | [**Category**](Category.md) |  | [optional] 
 **tags** | **[Tag]** |  | [optional] 
 **status** | **str** | pet status in the store | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Pig.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Pig.md
index a92a9b33bba..a78250c2f4d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Pig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Pig.md
@@ -1,9 +1,8 @@
 # petstore_api.model.pig.Pig
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/Player.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md
index 7b197b8ae0a..a63109fab7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md
@@ -7,7 +7,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** |  | [optional] 
 **enemyPlayer** | [**Player**](Player.md) |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Quadrilateral.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Quadrilateral.md
index 9679735b16c..0d734acf79c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Quadrilateral.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Quadrilateral.md
@@ -1,9 +1,8 @@
 # petstore_api.model.quadrilateral.Quadrilateral
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/QuadrilateralInterface.md b/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md
index 918d4762b8d..c6db5a24949 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **shapeType** | **str** |  | 
 **quadrilateralType** | **str** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md
index 49adca26731..65c4bfebf9e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional] [readonly] 
 **baz** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ScaleneTriangle.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ScaleneTriangle.md
index 628b7db557d..8036ccf67bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ScaleneTriangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ScaleneTriangle.md
@@ -1,9 +1,8 @@
 # petstore_api.model.scalene_triangle.ScaleneTriangle
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/Shape.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Shape.md
index e7e5b4cc27b..8a625442a9f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Shape.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Shape.md
@@ -1,9 +1,8 @@
 # petstore_api.model.shape.Shape
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/ShapeOrNull.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ShapeOrNull.md
index 51cf318fb73..3b224d1aded 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ShapeOrNull.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ShapeOrNull.md
@@ -2,10 +2,9 @@
 
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/SimpleQuadrilateral.md b/samples/openapi3/client/petstore/python-experimental/docs/models/SimpleQuadrilateral.md
index e37d66bcfba..e25fb11b8ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/SimpleQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/SimpleQuadrilateral.md
@@ -1,9 +1,8 @@
 # petstore_api.model.simple_quadrilateral.SimpleQuadrilateral
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/SomeObject.md b/samples/openapi3/client/petstore/python-experimental/docs/models/SomeObject.md
index d3dc6f7b22b..941476a9e5e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/SomeObject.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/SomeObject.md
@@ -1,9 +1,8 @@
 # petstore_api.model.some_object.SomeObject
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/SpecialModelName.md b/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md
index aedbd419fd1..6449724f69a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md
@@ -6,7 +6,6 @@ model with an invalid class name for python
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **a** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md
index 98171895d2a..477b894e242 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **int** |  | [optional] 
 **name** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Triangle.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Triangle.md
index adbb7f0c509..30045f29811 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Triangle.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Triangle.md
@@ -1,9 +1,8 @@
 # petstore_api.model.triangle.Triangle
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/docs/models/TriangleInterface.md b/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md
index 205bc4b2065..168c654417f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **shapeType** | **str** |  | 
 **triangleType** | **str** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/User.md b/samples/openapi3/client/petstore/python-experimental/docs/models/User.md
index 8c878d9bd54..449ffd004ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/User.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/User.md
@@ -16,7 +16,6 @@ Name | Type | Description | Notes
 **anyTypeProp** | **bool, date, datetime, dict, float, int, list, str, none_type** | test code generation for any type Here the &#x27;type&#x27; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **anyTypeExceptNullProp** | **bool, date, datetime, dict, float, int, list, str, none_type** | any type except &#x27;null&#x27; Here the &#x27;type&#x27; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. | [optional] 
 **anyTypePropNullable** | **bool, date, datetime, dict, float, int, list, str, none_type** | test code generation for any type Here the &#x27;type&#x27; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#x27;nullable&#x27; attribute does not change the allowed values. | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md
index 2bdabf23ae8..3af76af8382 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md
@@ -6,7 +6,6 @@ Name | Type | Description | Notes
 **className** | **str** |  | 
 **hasBaleen** | **bool** |  | [optional] 
 **hasTeeth** | **bool** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index bddd02d9342..2370938fa7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -127,12 +127,29 @@ class AdditionalPropertiesClass(
                         **kwargs,
                     )
             anytype_1 = schemas.AnyTypeSchema
-            map_with_undeclared_properties_anytype_1 = schemas.DictSchema
-            map_with_undeclared_properties_anytype_2 = schemas.DictSchema
-            map_with_undeclared_properties_anytype_3 = schemas.DictSchema
             
             
-            class empty_map(
+            class map_with_undeclared_properties_anytype_1(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    additional_properties = None
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                ) -> 'map_with_undeclared_properties_anytype_1':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                    )
+            
+            
+            class map_with_undeclared_properties_anytype_2(
                 schemas.DictSchema
             ):
             
@@ -144,11 +161,94 @@ class AdditionalPropertiesClass(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                ) -> 'map_with_undeclared_properties_anytype_2':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                    )
+            
+            
+            class map_with_undeclared_properties_anytype_3(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    additional_properties = schemas.AnyTypeSchema
+                
+                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    # dict_instance[name] accessor
+                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+                        return super().__getitem__(name)
+                    try:
+                        return super().__getitem__(name)
+                    except KeyError:
+                        return schemas.unset
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                ) -> 'map_with_undeclared_properties_anytype_3':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                        **kwargs,
+                    )
+            
+            
+            class empty_map(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    
+                    
+                    class additional_properties(
+                        schemas.ComposedSchema,
+                    ):
+                    
+                    
+                        class MetaOapg:
+                            additional_properties = None
+                            not_schema = schemas.AnyTypeSchema
+                    
+                    
+                        def __new__(
+                            cls,
+                            *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                            _configuration: typing.Optional[schemas.Configuration] = None,
+                        ) -> 'additional_properties':
+                            return super().__new__(
+                                cls,
+                                *args,
+                                _configuration=_configuration,
+                            )
+                
+                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    # dict_instance[name] accessor
+                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+                        return super().__getitem__(name)
+                    try:
+                        return super().__getitem__(name)
+                    except KeyError:
+                        return schemas.unset
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'empty_map':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             
             
@@ -191,7 +291,7 @@ class AdditionalPropertiesClass(
                 "empty_map": empty_map,
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     map_property: typing.Union[MetaOapg.properties.map_property, schemas.Unset]
     map_of_map_property: typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]
@@ -226,10 +326,7 @@ class AdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["map_property"], typing.Literal["map_of_map_property"], typing.Literal["anytype_1"], typing.Literal["map_with_undeclared_properties_anytype_1"], typing.Literal["map_with_undeclared_properties_anytype_2"], typing.Literal["map_with_undeclared_properties_anytype_3"], typing.Literal["empty_map"], typing.Literal["map_with_undeclared_properties_string"], ]):
+    def __getitem__(self, name: typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -237,6 +334,7 @@ class AdditionalPropertiesClass(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -250,7 +348,6 @@ class AdditionalPropertiesClass(
         empty_map: typing.Union[MetaOapg.properties.empty_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -264,5 +361,4 @@ class AdditionalPropertiesClass(
             empty_map=empty_map,
             map_with_undeclared_properties_string=map_with_undeclared_properties_string,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index bddd02d9342..2370938fa7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -127,12 +127,29 @@ class AdditionalPropertiesClass(
                         **kwargs,
                     )
             anytype_1 = schemas.AnyTypeSchema
-            map_with_undeclared_properties_anytype_1 = schemas.DictSchema
-            map_with_undeclared_properties_anytype_2 = schemas.DictSchema
-            map_with_undeclared_properties_anytype_3 = schemas.DictSchema
             
             
-            class empty_map(
+            class map_with_undeclared_properties_anytype_1(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    additional_properties = None
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                ) -> 'map_with_undeclared_properties_anytype_1':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                    )
+            
+            
+            class map_with_undeclared_properties_anytype_2(
                 schemas.DictSchema
             ):
             
@@ -144,11 +161,94 @@ class AdditionalPropertiesClass(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                ) -> 'map_with_undeclared_properties_anytype_2':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                    )
+            
+            
+            class map_with_undeclared_properties_anytype_3(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    additional_properties = schemas.AnyTypeSchema
+                
+                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    # dict_instance[name] accessor
+                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+                        return super().__getitem__(name)
+                    try:
+                        return super().__getitem__(name)
+                    except KeyError:
+                        return schemas.unset
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                ) -> 'map_with_undeclared_properties_anytype_3':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                        **kwargs,
+                    )
+            
+            
+            class empty_map(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    
+                    
+                    class additional_properties(
+                        schemas.ComposedSchema,
+                    ):
+                    
+                    
+                        class MetaOapg:
+                            additional_properties = None
+                            not_schema = schemas.AnyTypeSchema
+                    
+                    
+                        def __new__(
+                            cls,
+                            *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                            _configuration: typing.Optional[schemas.Configuration] = None,
+                        ) -> 'additional_properties':
+                            return super().__new__(
+                                cls,
+                                *args,
+                                _configuration=_configuration,
+                            )
+                
+                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    # dict_instance[name] accessor
+                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+                        return super().__getitem__(name)
+                    try:
+                        return super().__getitem__(name)
+                    except KeyError:
+                        return schemas.unset
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'empty_map':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             
             
@@ -191,7 +291,7 @@ class AdditionalPropertiesClass(
                 "empty_map": empty_map,
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     map_property: typing.Union[MetaOapg.properties.map_property, schemas.Unset]
     map_of_map_property: typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]
@@ -226,10 +326,7 @@ class AdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["map_property"], typing.Literal["map_of_map_property"], typing.Literal["anytype_1"], typing.Literal["map_with_undeclared_properties_anytype_1"], typing.Literal["map_with_undeclared_properties_anytype_2"], typing.Literal["map_with_undeclared_properties_anytype_3"], typing.Literal["empty_map"], typing.Literal["map_with_undeclared_properties_string"], ]):
+    def __getitem__(self, name: typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -237,6 +334,7 @@ class AdditionalPropertiesClass(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -250,7 +348,6 @@ class AdditionalPropertiesClass(
         empty_map: typing.Union[MetaOapg.properties.empty_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -264,5 +361,4 @@ class AdditionalPropertiesClass(
             empty_map=empty_map,
             map_with_undeclared_properties_string=map_with_undeclared_properties_string,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 41bfccddea2..41dc7d3d1bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -53,7 +53,7 @@ class Animal(
                 "className": className,
                 "color": color,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     color: typing.Union[MetaOapg.properties.color, schemas.Unset]
@@ -64,10 +64,7 @@ class Animal(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], typing.Literal["color"], ]):
+    def __getitem__(self, name: typing.Literal["className", "color", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -75,6 +72,7 @@ class Animal(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -82,7 +80,6 @@ class Animal(
         className: typing.Union[MetaOapg.properties.className, str, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Animal':
         return super().__new__(
             cls,
@@ -90,7 +87,6 @@ class Animal(
             className=className,
             color=color,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.cat import Cat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 41bfccddea2..41dc7d3d1bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -53,7 +53,7 @@ class Animal(
                 "className": className,
                 "color": color,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     color: typing.Union[MetaOapg.properties.color, schemas.Unset]
@@ -64,10 +64,7 @@ class Animal(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], typing.Literal["color"], ]):
+    def __getitem__(self, name: typing.Literal["className", "color", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -75,6 +72,7 @@ class Animal(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -82,7 +80,6 @@ class Animal(
         className: typing.Union[MetaOapg.properties.className, str, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Animal':
         return super().__new__(
             cls,
@@ -90,7 +87,6 @@ class Animal(
             className=className,
             color=color,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.cat import Cat
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 9fb2ed5e3db..5507431c5a0 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
@@ -33,28 +33,17 @@ class AnyTypeNotString(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         not_schema = schemas.StrSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
index 9fb2ed5e3db..5507431c5a0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
@@ -33,28 +33,17 @@ class AnyTypeNotString(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         not_schema = schemas.StrSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index ad54cd266ad..2eaaf5a2fdc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -42,7 +42,7 @@ class ApiResponse(
                 "type": type,
                 "message": message,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     code: typing.Union[MetaOapg.properties.code, schemas.Unset]
     type: typing.Union[MetaOapg.properties.type, schemas.Unset]
@@ -57,10 +57,7 @@ class ApiResponse(
     @typing.overload
     def __getitem__(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["code"], typing.Literal["type"], typing.Literal["message"], ]):
+    def __getitem__(self, name: typing.Literal["code", "type", "message", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -68,6 +65,7 @@ class ApiResponse(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -76,7 +74,6 @@ class ApiResponse(
         type: typing.Union[MetaOapg.properties.type, str, schemas.Unset] = schemas.unset,
         message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
@@ -85,5 +82,4 @@ class ApiResponse(
             type=type,
             message=message,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index ad54cd266ad..2eaaf5a2fdc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -42,7 +42,7 @@ class ApiResponse(
                 "type": type,
                 "message": message,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     code: typing.Union[MetaOapg.properties.code, schemas.Unset]
     type: typing.Union[MetaOapg.properties.type, schemas.Unset]
@@ -57,10 +57,7 @@ class ApiResponse(
     @typing.overload
     def __getitem__(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["code"], typing.Literal["type"], typing.Literal["message"], ]):
+    def __getitem__(self, name: typing.Literal["code", "type", "message", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -68,6 +65,7 @@ class ApiResponse(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -76,7 +74,6 @@ class ApiResponse(
         type: typing.Union[MetaOapg.properties.type, str, schemas.Unset] = schemas.unset,
         message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
@@ -85,5 +82,4 @@ class ApiResponse(
             type=type,
             message=message,
             _configuration=_configuration,
-            **kwargs,
         )
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 4b6c96c0a18..b8f8b1df0c7 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
@@ -70,7 +70,7 @@ class Apple(
                 "cultivar": cultivar,
                 "origin": origin,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     cultivar: MetaOapg.properties.cultivar
@@ -82,10 +82,7 @@ class Apple(
     @typing.overload
     def __getitem__(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["cultivar"], typing.Literal["origin"], ]):
+    def __getitem__(self, name: typing.Literal["cultivar", "origin", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -93,18 +90,17 @@ class Apple(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, None, ],
         origin: typing.Union[MetaOapg.properties.origin, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Apple':
         return super().__new__(
             cls,
             *args,
             origin=origin,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index 9347ed0d6a2..d2f5cc89e5d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -57,7 +57,7 @@ class Apple(
                 "cultivar": cultivar,
                 "origin": origin,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     cultivar: MetaOapg.properties.cultivar
@@ -69,10 +69,7 @@ class Apple(
     @typing.overload
     def __getitem__(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["cultivar"], typing.Literal["origin"], ]):
+    def __getitem__(self, name: typing.Literal["cultivar", "origin", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -80,18 +77,17 @@ class Apple(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, None, ],
         origin: typing.Union[MetaOapg.properties.origin, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Apple':
         return super().__new__(
             cls,
             *args,
             origin=origin,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index 70adaaa1efa..df24a42e601 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -43,7 +43,28 @@ class AppleReq(
                 "cultivar": cultivar,
                 "mealy": mealy,
             }
-        additional_properties = None
+        
+        
+        class additional_properties(
+            schemas.ComposedSchema,
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+                not_schema = schemas.AnyTypeSchema
+        
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'additional_properties':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
     
     cultivar: MetaOapg.properties.cultivar
     mealy: typing.Union[MetaOapg.properties.mealy, schemas.Unset]
@@ -54,7 +75,10 @@ class AppleReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["cultivar", "mealy", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[str, typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,7 +86,6 @@ class AppleReq(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
-    
 
     def __new__(
         cls,
@@ -70,6 +93,7 @@ class AppleReq(
         cultivar: typing.Union[MetaOapg.properties.cultivar, str, ],
         mealy: typing.Union[MetaOapg.properties.mealy, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AppleReq':
         return super().__new__(
             cls,
@@ -77,4 +101,5 @@ class AppleReq(
             cultivar=cultivar,
             mealy=mealy,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index 70adaaa1efa..df24a42e601 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -43,7 +43,28 @@ class AppleReq(
                 "cultivar": cultivar,
                 "mealy": mealy,
             }
-        additional_properties = None
+        
+        
+        class additional_properties(
+            schemas.ComposedSchema,
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+                not_schema = schemas.AnyTypeSchema
+        
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'additional_properties':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
     
     cultivar: MetaOapg.properties.cultivar
     mealy: typing.Union[MetaOapg.properties.mealy, schemas.Unset]
@@ -54,7 +75,10 @@ class AppleReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["cultivar", "mealy", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[str, typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,7 +86,6 @@ class AppleReq(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
-    
 
     def __new__(
         cls,
@@ -70,6 +93,7 @@ class AppleReq(
         cultivar: typing.Union[MetaOapg.properties.cultivar, str, ],
         mealy: typing.Union[MetaOapg.properties.mealy, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AppleReq':
         return super().__new__(
             cls,
@@ -77,4 +101,5 @@ class AppleReq(
             cultivar=cultivar,
             mealy=mealy,
             _configuration=_configuration,
+            **kwargs,
         )
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 213201bd87d..c69a42a0995 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
@@ -82,17 +82,14 @@ class ArrayOfArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["ArrayArrayNumber"], ]):
+    def __getitem__(self, name: typing.Literal["ArrayArrayNumber", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -100,18 +97,17 @@ class ArrayOfArrayOfNumberOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayArrayNumber=ArrayArrayNumber,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index 213201bd87d..c69a42a0995 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -82,17 +82,14 @@ class ArrayOfArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["ArrayArrayNumber"], ]):
+    def __getitem__(self, name: typing.Literal["ArrayArrayNumber", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -100,18 +97,17 @@ class ArrayOfArrayOfNumberOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayArrayNumber=ArrayArrayNumber,
             _configuration=_configuration,
-            **kwargs,
         )
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 72132716fe6..1d900261a25 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
@@ -60,17 +60,14 @@ class ArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayNumber": ArrayNumber,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["ArrayNumber"], ]):
+    def __getitem__(self, name: typing.Literal["ArrayNumber", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -78,18 +75,17 @@ class ArrayOfNumberOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayNumber=ArrayNumber,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 72132716fe6..1d900261a25 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -60,17 +60,14 @@ class ArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayNumber": ArrayNumber,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["ArrayNumber"], ]):
+    def __getitem__(self, name: typing.Literal["ArrayNumber", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -78,18 +75,17 @@ class ArrayOfNumberOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayNumber=ArrayNumber,
             _configuration=_configuration,
-            **kwargs,
         )
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 43b81f34764..ddf7b6b7400 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
@@ -156,7 +156,7 @@ class ArrayTest(
                 "array_array_of_integer": array_array_of_integer,
                 "array_array_of_model": array_array_of_model,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     array_of_string: typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]
     array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]
@@ -171,10 +171,7 @@ class ArrayTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["array_of_string"], typing.Literal["array_array_of_integer"], typing.Literal["array_array_of_model"], ]):
+    def __getitem__(self, name: typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -182,6 +179,7 @@ class ArrayTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -190,7 +188,6 @@ class ArrayTest(
         array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, tuple, schemas.Unset] = schemas.unset,
         array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
@@ -199,7 +196,6 @@ class ArrayTest(
             array_array_of_integer=array_array_of_integer,
             array_array_of_model=array_array_of_model,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.read_only_first import ReadOnlyFirst
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index 43b81f34764..ddf7b6b7400 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -156,7 +156,7 @@ class ArrayTest(
                 "array_array_of_integer": array_array_of_integer,
                 "array_array_of_model": array_array_of_model,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     array_of_string: typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]
     array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]
@@ -171,10 +171,7 @@ class ArrayTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["array_of_string"], typing.Literal["array_array_of_integer"], typing.Literal["array_array_of_model"], ]):
+    def __getitem__(self, name: typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -182,6 +179,7 @@ class ArrayTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -190,7 +188,6 @@ class ArrayTest(
         array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, tuple, schemas.Unset] = schemas.unset,
         array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
@@ -199,7 +196,6 @@ class ArrayTest(
             array_array_of_integer=array_array_of_integer,
             array_array_of_model=array_array_of_model,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.read_only_first import ReadOnlyFirst
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index 4b02a64baa1..e87331adc83 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -41,17 +41,14 @@ class Banana(
             __annotations__ = {
                 "lengthCm": lengthCm,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     lengthCm: MetaOapg.properties.lengthCm
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["lengthCm"], ]):
+    def __getitem__(self, name: typing.Literal["lengthCm", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -59,18 +56,17 @@ class Banana(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Banana':
         return super().__new__(
             cls,
             *args,
             lengthCm=lengthCm,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index 4b02a64baa1..e87331adc83 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -41,17 +41,14 @@ class Banana(
             __annotations__ = {
                 "lengthCm": lengthCm,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     lengthCm: MetaOapg.properties.lengthCm
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["lengthCm"], ]):
+    def __getitem__(self, name: typing.Literal["lengthCm", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -59,18 +56,17 @@ class Banana(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Banana':
         return super().__new__(
             cls,
             *args,
             lengthCm=lengthCm,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index f459e97f52a..b66ae4dc97a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -43,7 +43,28 @@ class BananaReq(
                 "lengthCm": lengthCm,
                 "sweet": sweet,
             }
-        additional_properties = None
+        
+        
+        class additional_properties(
+            schemas.ComposedSchema,
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+                not_schema = schemas.AnyTypeSchema
+        
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'additional_properties':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
     
     lengthCm: MetaOapg.properties.lengthCm
     sweet: typing.Union[MetaOapg.properties.sweet, schemas.Unset]
@@ -54,7 +75,10 @@ class BananaReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["lengthCm", "sweet", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[str, typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,7 +86,6 @@ class BananaReq(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
-    
 
     def __new__(
         cls,
@@ -70,6 +93,7 @@ class BananaReq(
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         sweet: typing.Union[MetaOapg.properties.sweet, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'BananaReq':
         return super().__new__(
             cls,
@@ -77,4 +101,5 @@ class BananaReq(
             lengthCm=lengthCm,
             sweet=sweet,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index f459e97f52a..b66ae4dc97a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -43,7 +43,28 @@ class BananaReq(
                 "lengthCm": lengthCm,
                 "sweet": sweet,
             }
-        additional_properties = None
+        
+        
+        class additional_properties(
+            schemas.ComposedSchema,
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+                not_schema = schemas.AnyTypeSchema
+        
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'additional_properties':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
     
     lengthCm: MetaOapg.properties.lengthCm
     sweet: typing.Union[MetaOapg.properties.sweet, schemas.Unset]
@@ -54,7 +75,10 @@ class BananaReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["lengthCm", "sweet", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[str, typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,7 +86,6 @@ class BananaReq(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
-    
 
     def __new__(
         cls,
@@ -70,6 +93,7 @@ class BananaReq(
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         sweet: typing.Union[MetaOapg.properties.sweet, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'BananaReq':
         return super().__new__(
             cls,
@@ -77,4 +101,5 @@ class BananaReq(
             lengthCm=lengthCm,
             sweet=sweet,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index 0cee9859034..f40d4d7ba22 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -55,17 +55,14 @@ class BasquePig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], ]):
+    def __getitem__(self, name: typing.Literal["className", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,18 +70,17 @@ class BasquePig(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'BasquePig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index 0cee9859034..f40d4d7ba22 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -55,17 +55,14 @@ class BasquePig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], ]):
+    def __getitem__(self, name: typing.Literal["className", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,18 +70,17 @@ class BasquePig(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'BasquePig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index 106b5681cc3..e95c90d1b8d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -48,7 +48,7 @@ class Capitalization(
                 "SCA_ETH_Flow_Points": SCA_ETH_Flow_Points,
                 "ATT_NAME": ATT_NAME,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     smallCamel: typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]
     CapitalCamel: typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]
@@ -75,10 +75,7 @@ class Capitalization(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["smallCamel"], typing.Literal["CapitalCamel"], typing.Literal["small_Snake"], typing.Literal["Capital_Snake"], typing.Literal["SCA_ETH_Flow_Points"], typing.Literal["ATT_NAME"], ]):
+    def __getitem__(self, name: typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -86,6 +83,7 @@ class Capitalization(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -97,7 +95,6 @@ class Capitalization(
         SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, str, schemas.Unset] = schemas.unset,
         ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Capitalization':
         return super().__new__(
             cls,
@@ -109,5 +106,4 @@ class Capitalization(
             SCA_ETH_Flow_Points=SCA_ETH_Flow_Points,
             ATT_NAME=ATT_NAME,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index 106b5681cc3..e95c90d1b8d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -48,7 +48,7 @@ class Capitalization(
                 "SCA_ETH_Flow_Points": SCA_ETH_Flow_Points,
                 "ATT_NAME": ATT_NAME,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     smallCamel: typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]
     CapitalCamel: typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]
@@ -75,10 +75,7 @@ class Capitalization(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["smallCamel"], typing.Literal["CapitalCamel"], typing.Literal["small_Snake"], typing.Literal["Capital_Snake"], typing.Literal["SCA_ETH_Flow_Points"], typing.Literal["ATT_NAME"], ]):
+    def __getitem__(self, name: typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -86,6 +83,7 @@ class Capitalization(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -97,7 +95,6 @@ class Capitalization(
         SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, str, schemas.Unset] = schemas.unset,
         ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Capitalization':
         return super().__new__(
             cls,
@@ -109,5 +106,4 @@ class Capitalization(
             SCA_ETH_Flow_Points=SCA_ETH_Flow_Points,
             ATT_NAME=ATT_NAME,
             _configuration=_configuration,
-            **kwargs,
         )
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 d7fafe48456..232870f50f6 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
@@ -33,7 +33,7 @@ class Cat(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -47,17 +47,14 @@ class Cat(
                     __annotations__ = {
                         "declawed": declawed,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             declawed: typing.Union[MetaOapg.properties.declawed, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["declawed"], ]):
+            def __getitem__(self, name: typing.Literal["declawed", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -65,20 +62,19 @@ class Cat(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 declawed: typing.Union[MetaOapg.properties.declawed, bool, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     declawed=declawed,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -97,27 +93,16 @@ class Cat(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Cat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index d7fafe48456..232870f50f6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -33,7 +33,7 @@ class Cat(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -47,17 +47,14 @@ class Cat(
                     __annotations__ = {
                         "declawed": declawed,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             declawed: typing.Union[MetaOapg.properties.declawed, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["declawed"], ]):
+            def __getitem__(self, name: typing.Literal["declawed", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -65,20 +62,19 @@ class Cat(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 declawed: typing.Union[MetaOapg.properties.declawed, bool, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     declawed=declawed,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -97,27 +93,16 @@ class Cat(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Cat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
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 3d79dbac317..08599819136 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,7 +43,7 @@ class Category(
                 "name": name,
                 "id": id,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     name: MetaOapg.properties.name
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
@@ -54,10 +54,7 @@ class Category(
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["id"], ]):
+    def __getitem__(self, name: typing.Literal["name", "id", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -65,6 +62,7 @@ class Category(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -72,7 +70,6 @@ class Category(
         name: typing.Union[MetaOapg.properties.name, str, ],
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Category':
         return super().__new__(
             cls,
@@ -80,5 +77,4 @@ class Category(
             name=name,
             id=id,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index 3d79dbac317..08599819136 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -43,7 +43,7 @@ class Category(
                 "name": name,
                 "id": id,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     name: MetaOapg.properties.name
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
@@ -54,10 +54,7 @@ class Category(
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["id"], ]):
+    def __getitem__(self, name: typing.Literal["name", "id", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -65,6 +62,7 @@ class Category(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -72,7 +70,6 @@ class Category(
         name: typing.Union[MetaOapg.properties.name, str, ],
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Category':
         return super().__new__(
             cls,
@@ -80,5 +77,4 @@ class Category(
             name=name,
             id=id,
             _configuration=_configuration,
-            **kwargs,
         )
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 8a8ab83ff0a..91ec8188912 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
@@ -33,7 +33,7 @@ class ChildCat(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -47,17 +47,14 @@ class ChildCat(
                     __annotations__ = {
                         "name": name,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             name: typing.Union[MetaOapg.properties.name, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["name"], ]):
+            def __getitem__(self, name: typing.Literal["name", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -65,20 +62,19 @@ class ChildCat(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     name=name,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -97,27 +93,16 @@ class ChildCat(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ChildCat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.parent_pet import ParentPet
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 8a8ab83ff0a..91ec8188912 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -33,7 +33,7 @@ class ChildCat(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -47,17 +47,14 @@ class ChildCat(
                     __annotations__ = {
                         "name": name,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             name: typing.Union[MetaOapg.properties.name, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["name"], ]):
+            def __getitem__(self, name: typing.Literal["name", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -65,20 +62,19 @@ class ChildCat(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     name=name,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -97,27 +93,16 @@ class ChildCat(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ChildCat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.parent_pet import ParentPet
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 c26397416a5..f80b7c1f315 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,7 +40,7 @@ class ClassModel(
             __annotations__ = {
                 "_class": _class,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     _class: typing.Union[MetaOapg.properties._class, schemas.Unset]
@@ -48,10 +48,7 @@ class ClassModel(
     @typing.overload
     def __getitem__(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["_class"], ]):
+    def __getitem__(self, name: typing.Literal["_class", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -59,18 +56,17 @@ class ClassModel(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _class: typing.Union[MetaOapg.properties._class, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ClassModel':
         return super().__new__(
             cls,
             *args,
             _class=_class,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index c26397416a5..f80b7c1f315 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -40,7 +40,7 @@ class ClassModel(
             __annotations__ = {
                 "_class": _class,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     _class: typing.Union[MetaOapg.properties._class, schemas.Unset]
@@ -48,10 +48,7 @@ class ClassModel(
     @typing.overload
     def __getitem__(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["_class"], ]):
+    def __getitem__(self, name: typing.Literal["_class", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -59,18 +56,17 @@ class ClassModel(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _class: typing.Union[MetaOapg.properties._class, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ClassModel':
         return super().__new__(
             cls,
             *args,
             _class=_class,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index f8cb4767e36..86b26354c84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -38,17 +38,14 @@ class Client(
             __annotations__ = {
                 "client": client,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     client: typing.Union[MetaOapg.properties.client, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["client"], ]):
+    def __getitem__(self, name: typing.Literal["client", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,18 +53,17 @@ class Client(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         client: typing.Union[MetaOapg.properties.client, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Client':
         return super().__new__(
             cls,
             *args,
             client=client,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index f8cb4767e36..86b26354c84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -38,17 +38,14 @@ class Client(
             __annotations__ = {
                 "client": client,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     client: typing.Union[MetaOapg.properties.client, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["client"], ]):
+    def __getitem__(self, name: typing.Literal["client", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,18 +53,17 @@ class Client(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         client: typing.Union[MetaOapg.properties.client, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Client':
         return super().__new__(
             cls,
             *args,
             client=client,
             _configuration=_configuration,
-            **kwargs,
         )
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 e888b8d1ff9..9fda3e0a9d0 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
@@ -33,7 +33,7 @@ class ComplexQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class ComplexQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["quadrilateralType"], ]):
+            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class ComplexQuadrilateral(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class ComplexQuadrilateral(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index e888b8d1ff9..9fda3e0a9d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -33,7 +33,7 @@ class ComplexQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class ComplexQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["quadrilateralType"], ]):
+            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class ComplexQuadrilateral(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class ComplexQuadrilateral(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
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 9703c6147e2..c6cc1812d24 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
@@ -33,14 +33,52 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-        any_of_0 = schemas.DictSchema
+        additional_properties = None
+        
+        
+        class any_of_0(
+            schemas.DictSchema
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'any_of_0':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
         any_of_1 = schemas.DateSchema
         any_of_2 = schemas.DateTimeSchema
         any_of_3 = schemas.BinarySchema
         any_of_4 = schemas.StrSchema
         any_of_5 = schemas.StrSchema
-        any_of_6 = schemas.DictSchema
+        
+        
+        class any_of_6(
+            schemas.DictSchema
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'any_of_6':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
         any_of_7 = schemas.BoolSchema
         any_of_8 = schemas.NoneSchema
         
@@ -103,25 +141,14 @@ class ComposedAnyOfDifferentTypesNoValidations(
                 cls.any_of_15,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
index 9703c6147e2..c6cc1812d24 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
@@ -33,14 +33,52 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-        any_of_0 = schemas.DictSchema
+        additional_properties = None
+        
+        
+        class any_of_0(
+            schemas.DictSchema
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'any_of_0':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
         any_of_1 = schemas.DateSchema
         any_of_2 = schemas.DateTimeSchema
         any_of_3 = schemas.BinarySchema
         any_of_4 = schemas.StrSchema
         any_of_5 = schemas.StrSchema
-        any_of_6 = schemas.DictSchema
+        
+        
+        class any_of_6(
+            schemas.DictSchema
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'any_of_6':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
         any_of_7 = schemas.BoolSchema
         any_of_8 = schemas.NoneSchema
         
@@ -103,25 +141,14 @@ class ComposedAnyOfDifferentTypesNoValidations(
                 cls.any_of_15,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
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 5389adffe5c..f761b09f13f 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
@@ -34,7 +34,7 @@ class ComposedObject(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
@@ -52,25 +52,14 @@ class ComposedObject(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
index 5389adffe5c..f761b09f13f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
@@ -34,7 +34,7 @@ class ComposedObject(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
@@ -52,25 +52,14 @@ class ComposedObject(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
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 ac51a12dd7d..f9a23957f7f 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
@@ -35,7 +35,7 @@ class ComposedOneOfDifferentTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_2 = schemas.NoneSchema
         one_of_3 = schemas.DateSchema
         
@@ -46,30 +46,19 @@ class ComposedOneOfDifferentTypes(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
                 max_properties = 4
                 min_properties = 4
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'one_of_4':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         
@@ -129,27 +118,16 @@ class ComposedOneOfDifferentTypes(
                 cls.one_of_6,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
index d6ddcb41a47..1a375b3b80a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
@@ -35,7 +35,7 @@ class ComposedOneOfDifferentTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_2 = schemas.NoneSchema
         one_of_3 = schemas.DateSchema
         
@@ -46,28 +46,17 @@ class ComposedOneOfDifferentTypes(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                additional_properties = None
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'one_of_4':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         
@@ -120,27 +109,16 @@ class ComposedOneOfDifferentTypes(
                 cls.one_of_6,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index cc098460560..c4360f71f23 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -55,17 +55,14 @@ class DanishPig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], ]):
+    def __getitem__(self, name: typing.Literal["className", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,18 +70,17 @@ class DanishPig(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'DanishPig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index cc098460560..c4360f71f23 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -55,17 +55,14 @@ class DanishPig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], ]):
+    def __getitem__(self, name: typing.Literal["className", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,18 +70,17 @@ class DanishPig(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'DanishPig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
-            **kwargs,
         )
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 7f18298c66d..2395abfa9d4 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
@@ -33,7 +33,7 @@ class Dog(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -47,17 +47,14 @@ class Dog(
                     __annotations__ = {
                         "breed": breed,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             breed: typing.Union[MetaOapg.properties.breed, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["breed"], ]):
+            def __getitem__(self, name: typing.Literal["breed", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -65,20 +62,19 @@ class Dog(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 breed: typing.Union[MetaOapg.properties.breed, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     breed=breed,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -97,27 +93,16 @@ class Dog(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Dog':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 7f18298c66d..2395abfa9d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -33,7 +33,7 @@ class Dog(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -47,17 +47,14 @@ class Dog(
                     __annotations__ = {
                         "breed": breed,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             breed: typing.Union[MetaOapg.properties.breed, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["breed"], ]):
+            def __getitem__(self, name: typing.Literal["breed", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -65,20 +62,19 @@ class Dog(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 breed: typing.Union[MetaOapg.properties.breed, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     breed=breed,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -97,27 +93,16 @@ class Dog(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Dog':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
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 53bb228ad5b..6d040985f18 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
@@ -102,7 +102,7 @@ class EnumArrays(
                 "just_symbol": just_symbol,
                 "array_enum": array_enum,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     just_symbol: typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]
     array_enum: typing.Union[MetaOapg.properties.array_enum, schemas.Unset]
@@ -113,10 +113,7 @@ class EnumArrays(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["just_symbol"], typing.Literal["array_enum"], ]):
+    def __getitem__(self, name: typing.Literal["just_symbol", "array_enum", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -124,6 +121,7 @@ class EnumArrays(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -131,7 +129,6 @@ class EnumArrays(
         just_symbol: typing.Union[MetaOapg.properties.just_symbol, str, schemas.Unset] = schemas.unset,
         array_enum: typing.Union[MetaOapg.properties.array_enum, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
@@ -139,5 +136,4 @@ class EnumArrays(
             just_symbol=just_symbol,
             array_enum=array_enum,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 53bb228ad5b..6d040985f18 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -102,7 +102,7 @@ class EnumArrays(
                 "just_symbol": just_symbol,
                 "array_enum": array_enum,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     just_symbol: typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]
     array_enum: typing.Union[MetaOapg.properties.array_enum, schemas.Unset]
@@ -113,10 +113,7 @@ class EnumArrays(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["just_symbol"], typing.Literal["array_enum"], ]):
+    def __getitem__(self, name: typing.Literal["just_symbol", "array_enum", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -124,6 +121,7 @@ class EnumArrays(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -131,7 +129,6 @@ class EnumArrays(
         just_symbol: typing.Union[MetaOapg.properties.just_symbol, str, schemas.Unset] = schemas.unset,
         array_enum: typing.Union[MetaOapg.properties.array_enum, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
@@ -139,5 +136,4 @@ class EnumArrays(
             just_symbol=just_symbol,
             array_enum=array_enum,
             _configuration=_configuration,
-            **kwargs,
         )
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 a1af011975e..7335cf9c067 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
@@ -169,7 +169,7 @@ class EnumTest(
                 "IntegerEnumWithDefaultValue": IntegerEnumWithDefaultValue,
                 "IntegerEnumOneValue": IntegerEnumOneValue,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     enum_string_required: MetaOapg.properties.enum_string_required
     enum_string: typing.Union[MetaOapg.properties.enum_string, schemas.Unset]
@@ -208,10 +208,7 @@ class EnumTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["enum_string_required"], typing.Literal["enum_string"], typing.Literal["enum_integer"], typing.Literal["enum_number"], typing.Literal["stringEnum"], typing.Literal["IntegerEnum"], typing.Literal["StringEnumWithDefaultValue"], typing.Literal["IntegerEnumWithDefaultValue"], typing.Literal["IntegerEnumOneValue"], ]):
+    def __getitem__(self, name: typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -219,6 +216,7 @@ class EnumTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -233,7 +231,6 @@ class EnumTest(
         IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'EnumTest':
         return super().__new__(
             cls,
@@ -248,7 +245,6 @@ class EnumTest(
             IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue,
             IntegerEnumOneValue=IntegerEnumOneValue,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.integer_enum import IntegerEnum
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index a1af011975e..7335cf9c067 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -169,7 +169,7 @@ class EnumTest(
                 "IntegerEnumWithDefaultValue": IntegerEnumWithDefaultValue,
                 "IntegerEnumOneValue": IntegerEnumOneValue,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     enum_string_required: MetaOapg.properties.enum_string_required
     enum_string: typing.Union[MetaOapg.properties.enum_string, schemas.Unset]
@@ -208,10 +208,7 @@ class EnumTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["enum_string_required"], typing.Literal["enum_string"], typing.Literal["enum_integer"], typing.Literal["enum_number"], typing.Literal["stringEnum"], typing.Literal["IntegerEnum"], typing.Literal["StringEnumWithDefaultValue"], typing.Literal["IntegerEnumWithDefaultValue"], typing.Literal["IntegerEnumOneValue"], ]):
+    def __getitem__(self, name: typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -219,6 +216,7 @@ class EnumTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -233,7 +231,6 @@ class EnumTest(
         IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'EnumTest':
         return super().__new__(
             cls,
@@ -248,7 +245,6 @@ class EnumTest(
             IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue,
             IntegerEnumOneValue=IntegerEnumOneValue,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.integer_enum import IntegerEnum
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 e2a243a9224..75c121b5a17 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
@@ -33,7 +33,7 @@ class EquilateralTriangle(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class EquilateralTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["triangleType"], ]):
+            def __getitem__(self, name: typing.Literal["triangleType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class EquilateralTriangle(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class EquilateralTriangle(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index e2a243a9224..75c121b5a17 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -33,7 +33,7 @@ class EquilateralTriangle(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class EquilateralTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["triangleType"], ]):
+            def __getitem__(self, name: typing.Literal["triangleType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class EquilateralTriangle(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class EquilateralTriangle(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index e8517d86e41..22ae4e9ba55 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -40,17 +40,14 @@ class File(
             __annotations__ = {
                 "sourceURI": sourceURI,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     sourceURI: typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["sourceURI"], ]):
+    def __getitem__(self, name: typing.Literal["sourceURI", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -58,18 +55,17 @@ class File(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         sourceURI: typing.Union[MetaOapg.properties.sourceURI, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'File':
         return super().__new__(
             cls,
             *args,
             sourceURI=sourceURI,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index e8517d86e41..22ae4e9ba55 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -40,17 +40,14 @@ class File(
             __annotations__ = {
                 "sourceURI": sourceURI,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     sourceURI: typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["sourceURI"], ]):
+    def __getitem__(self, name: typing.Literal["sourceURI", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -58,18 +55,17 @@ class File(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         sourceURI: typing.Union[MetaOapg.properties.sourceURI, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'File':
         return super().__new__(
             cls,
             *args,
             sourceURI=sourceURI,
             _configuration=_configuration,
-            **kwargs,
         )
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 57e39178983..62bfdfe50a9 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
@@ -70,7 +70,7 @@ class FileSchemaTestClass(
                 "file": file,
                 "files": files,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     file: typing.Union['File', schemas.Unset]
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
@@ -81,10 +81,7 @@ class FileSchemaTestClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["file"], typing.Literal["files"], ]):
+    def __getitem__(self, name: typing.Literal["file", "files", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -92,6 +89,7 @@ class FileSchemaTestClass(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -99,7 +97,6 @@ class FileSchemaTestClass(
         file: typing.Union['File', schemas.Unset] = schemas.unset,
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
@@ -107,7 +104,6 @@ class FileSchemaTestClass(
             file=file,
             files=files,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.file import File
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 57e39178983..62bfdfe50a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -70,7 +70,7 @@ class FileSchemaTestClass(
                 "file": file,
                 "files": files,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     file: typing.Union['File', schemas.Unset]
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
@@ -81,10 +81,7 @@ class FileSchemaTestClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["file"], typing.Literal["files"], ]):
+    def __getitem__(self, name: typing.Literal["file", "files", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -92,6 +89,7 @@ class FileSchemaTestClass(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -99,7 +97,6 @@ class FileSchemaTestClass(
         file: typing.Union['File', schemas.Unset] = schemas.unset,
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
@@ -107,7 +104,6 @@ class FileSchemaTestClass(
             file=file,
             files=files,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.file import File
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index eaea0b573d0..2830b96bc11 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -38,17 +38,14 @@ class Foo(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Literal["bar", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,18 +53,17 @@ class Foo(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Foo':
         return super().__new__(
             cls,
             *args,
             bar=bar,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index eaea0b573d0..2830b96bc11 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -38,17 +38,14 @@ class Foo(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Literal["bar", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,18 +53,17 @@ class Foo(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Foo':
         return super().__new__(
             cls,
             *args,
             bar=bar,
             _configuration=_configuration,
-            **kwargs,
         )
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 9d9d0365fd0..e38ef565964 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
@@ -199,7 +199,7 @@ class FormatTest(
                 "pattern_with_digits_and_delimiter": pattern_with_digits_and_delimiter,
                 "noneProp": noneProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     date: MetaOapg.properties.date
     number: MetaOapg.properties.number
@@ -223,16 +223,16 @@ class FormatTest(
     noneProp: typing.Union[MetaOapg.properties.noneProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
@@ -285,10 +285,7 @@ class FormatTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["date"], typing.Literal["number"], typing.Literal["password"], typing.Literal["byte"], typing.Literal["integer"], typing.Literal["int32"], typing.Literal["int32withValidations"], typing.Literal["int64"], typing.Literal["float"], typing.Literal["float32"], typing.Literal["double"], typing.Literal["float64"], typing.Literal["arrayWithUniqueItems"], typing.Literal["string"], typing.Literal["binary"], typing.Literal["dateTime"], typing.Literal["uuid"], typing.Literal["uuidNoExample"], typing.Literal["pattern_with_digits"], typing.Literal["pattern_with_digits_and_delimiter"], typing.Literal["noneProp"], ]):
+    def __getitem__(self, name: typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -296,6 +293,7 @@ class FormatTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -321,7 +319,6 @@ class FormatTest(
         pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, str, schemas.Unset] = schemas.unset,
         noneProp: typing.Union[MetaOapg.properties.noneProp, None, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'FormatTest':
         return super().__new__(
             cls,
@@ -347,5 +344,4 @@ class FormatTest(
             pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter,
             noneProp=noneProp,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index 5481d11eefa..7096edc96a5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -151,7 +151,7 @@ class FormatTest(
                 "pattern_with_digits_and_delimiter": pattern_with_digits_and_delimiter,
                 "noneProp": noneProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     date: MetaOapg.properties.date
     number: MetaOapg.properties.number
@@ -175,16 +175,16 @@ class FormatTest(
     noneProp: typing.Union[MetaOapg.properties.noneProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
@@ -237,10 +237,7 @@ class FormatTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["date"], typing.Literal["number"], typing.Literal["password"], typing.Literal["byte"], typing.Literal["integer"], typing.Literal["int32"], typing.Literal["int32withValidations"], typing.Literal["int64"], typing.Literal["float"], typing.Literal["float32"], typing.Literal["double"], typing.Literal["float64"], typing.Literal["arrayWithUniqueItems"], typing.Literal["string"], typing.Literal["binary"], typing.Literal["dateTime"], typing.Literal["uuid"], typing.Literal["uuidNoExample"], typing.Literal["pattern_with_digits"], typing.Literal["pattern_with_digits_and_delimiter"], typing.Literal["noneProp"], ]):
+    def __getitem__(self, name: typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -248,6 +245,7 @@ class FormatTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -273,7 +271,6 @@ class FormatTest(
         pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, str, schemas.Unset] = schemas.unset,
         noneProp: typing.Union[MetaOapg.properties.noneProp, None, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'FormatTest':
         return super().__new__(
             cls,
@@ -299,5 +296,4 @@ class FormatTest(
             pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter,
             noneProp=noneProp,
             _configuration=_configuration,
-            **kwargs,
         )
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 de8cd619ea1..448abb55e21 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
@@ -38,7 +38,7 @@ class Fruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -62,10 +62,7 @@ class Fruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["color"], ]):
+    def __getitem__(self, name: typing.Literal["color", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,20 +70,19 @@ class Fruit(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Fruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index de8cd619ea1..448abb55e21 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -38,7 +38,7 @@ class Fruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -62,10 +62,7 @@ class Fruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["color"], ]):
+    def __getitem__(self, name: typing.Literal["color", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,20 +70,19 @@ class Fruit(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Fruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
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 15d4db62bf6..237b8462c07 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
@@ -33,7 +33,7 @@ class FruitReq(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
@@ -53,27 +53,16 @@ class FruitReq(
                 BananaReq,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'FruitReq':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.apple_req import AppleReq
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
index 15d4db62bf6..237b8462c07 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
@@ -33,7 +33,7 @@ class FruitReq(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
@@ -53,27 +53,16 @@ class FruitReq(
                 BananaReq,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'FruitReq':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.apple_req import AppleReq
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 f6b78d4e011..86f788e6ff7 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
@@ -38,7 +38,7 @@ class GmFruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -62,10 +62,7 @@ class GmFruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["color"], ]):
+    def __getitem__(self, name: typing.Literal["color", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,20 +70,19 @@ class GmFruit(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'GmFruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index f6b78d4e011..86f788e6ff7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -38,7 +38,7 @@ class GmFruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -62,10 +62,7 @@ class GmFruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["color"], ]):
+    def __getitem__(self, name: typing.Literal["color", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,20 +70,19 @@ class GmFruit(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'GmFruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index b203b272778..cbfd86dc28a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -51,17 +51,14 @@ class GrandparentAnimal(
             __annotations__ = {
                 "pet_type": pet_type,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     pet_type: MetaOapg.properties.pet_type
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["pet_type"], ]):
+    def __getitem__(self, name: typing.Literal["pet_type", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -69,20 +66,19 @@ class GrandparentAnimal(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         pet_type: typing.Union[MetaOapg.properties.pet_type, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
             *args,
             pet_type=pet_type,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index b203b272778..cbfd86dc28a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -51,17 +51,14 @@ class GrandparentAnimal(
             __annotations__ = {
                 "pet_type": pet_type,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     pet_type: MetaOapg.properties.pet_type
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["pet_type"], ]):
+    def __getitem__(self, name: typing.Literal["pet_type", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -69,20 +66,19 @@ class GrandparentAnimal(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         pet_type: typing.Union[MetaOapg.properties.pet_type, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
             *args,
             pet_type=pet_type,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index 5c40051cde0..71b101c5fa7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -40,7 +40,7 @@ class HasOnlyReadOnly(
                 "bar": bar,
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
@@ -51,10 +51,7 @@ class HasOnlyReadOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Literal["bar", "foo", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,6 +59,7 @@ class HasOnlyReadOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -69,7 +67,6 @@ class HasOnlyReadOnly(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
@@ -77,5 +74,4 @@ class HasOnlyReadOnly(
             bar=bar,
             foo=foo,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index 5c40051cde0..71b101c5fa7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -40,7 +40,7 @@ class HasOnlyReadOnly(
                 "bar": bar,
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
@@ -51,10 +51,7 @@ class HasOnlyReadOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Literal["bar", "foo", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,6 +59,7 @@ class HasOnlyReadOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -69,7 +67,6 @@ class HasOnlyReadOnly(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
@@ -77,5 +74,4 @@ class HasOnlyReadOnly(
             bar=bar,
             foo=foo,
             _configuration=_configuration,
-            **kwargs,
         )
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 67a438a8b35..1be64b66a09 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
@@ -60,17 +60,14 @@ class HealthCheckResult(
             __annotations__ = {
                 "NullableMessage": NullableMessage,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["NullableMessage"], ]):
+    def __getitem__(self, name: typing.Literal["NullableMessage", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -78,18 +75,17 @@ class HealthCheckResult(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
             *args,
             NullableMessage=NullableMessage,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 67a438a8b35..1be64b66a09 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -60,17 +60,14 @@ class HealthCheckResult(
             __annotations__ = {
                 "NullableMessage": NullableMessage,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["NullableMessage"], ]):
+    def __getitem__(self, name: typing.Literal["NullableMessage", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -78,18 +75,17 @@ class HealthCheckResult(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
             *args,
             NullableMessage=NullableMessage,
             _configuration=_configuration,
-            **kwargs,
         )
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 de469799f3c..3d1ef3f636c 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
@@ -33,7 +33,7 @@ class IsoscelesTriangle(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class IsoscelesTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["triangleType"], ]):
+            def __getitem__(self, name: typing.Literal["triangleType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class IsoscelesTriangle(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class IsoscelesTriangle(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index de469799f3c..3d1ef3f636c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -33,7 +33,7 @@ class IsoscelesTriangle(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class IsoscelesTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["triangleType"], ]):
+            def __getitem__(self, name: typing.Literal["triangleType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class IsoscelesTriangle(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class IsoscelesTriangle(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
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 9d079bc225b..bcf9561deac 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
@@ -44,7 +44,7 @@ class Mammal(
                     'zebra': Zebra,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -63,27 +63,16 @@ class Mammal(
                 Pig,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Mammal':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.pig import Pig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
index 9d079bc225b..bcf9561deac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
@@ -44,7 +44,7 @@ class Mammal(
                     'zebra': Zebra,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -63,27 +63,16 @@ class Mammal(
                 Pig,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Mammal':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.pig import Pig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index 4da2de3720c..b8f8d56a33a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -188,7 +188,7 @@ class MapTest(
                 "direct_map": direct_map,
                 "indirect_map": indirect_map,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     map_map_of_string: typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]
     map_of_enum_string: typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]
@@ -207,10 +207,7 @@ class MapTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["map_map_of_string"], typing.Literal["map_of_enum_string"], typing.Literal["direct_map"], typing.Literal["indirect_map"], ]):
+    def __getitem__(self, name: typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -218,6 +215,7 @@ class MapTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -227,7 +225,6 @@ class MapTest(
         direct_map: typing.Union[MetaOapg.properties.direct_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['StringBooleanMap', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'MapTest':
         return super().__new__(
             cls,
@@ -237,7 +234,6 @@ class MapTest(
             direct_map=direct_map,
             indirect_map=indirect_map,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.string_boolean_map import StringBooleanMap
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index 4da2de3720c..b8f8d56a33a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -188,7 +188,7 @@ class MapTest(
                 "direct_map": direct_map,
                 "indirect_map": indirect_map,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     map_map_of_string: typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]
     map_of_enum_string: typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]
@@ -207,10 +207,7 @@ class MapTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["map_map_of_string"], typing.Literal["map_of_enum_string"], typing.Literal["direct_map"], typing.Literal["indirect_map"], ]):
+    def __getitem__(self, name: typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -218,6 +215,7 @@ class MapTest(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -227,7 +225,6 @@ class MapTest(
         direct_map: typing.Union[MetaOapg.properties.direct_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['StringBooleanMap', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'MapTest':
         return super().__new__(
             cls,
@@ -237,7 +234,6 @@ class MapTest(
             direct_map=direct_map,
             indirect_map=indirect_map,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.string_boolean_map import StringBooleanMap
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index 11d3e5d083b..7b5817d8bb0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "dateTime": dateTime,
                 "map": map,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
     dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
@@ -91,10 +91,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["uuid"], typing.Literal["dateTime"], typing.Literal["map"], ]):
+    def __getitem__(self, name: typing.Literal["uuid", "dateTime", "map", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -102,6 +99,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -110,7 +108,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         dateTime: typing.Union[MetaOapg.properties.dateTime, datetime, str, schemas.Unset] = schemas.unset,
         map: typing.Union[MetaOapg.properties.map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -119,7 +116,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             dateTime=dateTime,
             map=map,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index 11d3e5d083b..7b5817d8bb0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "dateTime": dateTime,
                 "map": map,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
     dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
@@ -91,10 +91,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["uuid"], typing.Literal["dateTime"], typing.Literal["map"], ]):
+    def __getitem__(self, name: typing.Literal["uuid", "dateTime", "map", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -102,6 +99,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -110,7 +108,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         dateTime: typing.Union[MetaOapg.properties.dateTime, datetime, str, schemas.Unset] = schemas.unset,
         map: typing.Union[MetaOapg.properties.map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -119,7 +116,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             dateTime=dateTime,
             map=map,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
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 ef87f52173f..c38b3d60a84 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
@@ -42,7 +42,7 @@ class Model200Response(
                 "name": name,
                 "class": _class,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
@@ -53,10 +53,7 @@ class Model200Response(
     @typing.overload
     def __getitem__(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["class"], ]):
+    def __getitem__(self, name: typing.Literal["name", "class", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -64,18 +61,17 @@ class Model200Response(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         name: typing.Union[MetaOapg.properties.name, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Model200Response':
         return super().__new__(
             cls,
             *args,
             name=name,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index ef87f52173f..c38b3d60a84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -42,7 +42,7 @@ class Model200Response(
                 "name": name,
                 "class": _class,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
@@ -53,10 +53,7 @@ class Model200Response(
     @typing.overload
     def __getitem__(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["class"], ]):
+    def __getitem__(self, name: typing.Literal["name", "class", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -64,18 +61,17 @@ class Model200Response(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         name: typing.Union[MetaOapg.properties.name, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Model200Response':
         return super().__new__(
             cls,
             *args,
             name=name,
             _configuration=_configuration,
-            **kwargs,
         )
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 c1db235af93..a7b5839068f 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
@@ -40,17 +40,14 @@ class ModelReturn(
             __annotations__ = {
                 "return": _return,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["return"], ]):
+    def __getitem__(self, name: typing.Literal["return", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -58,16 +55,15 @@ class ModelReturn(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ModelReturn':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index c1db235af93..a7b5839068f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -40,17 +40,14 @@ class ModelReturn(
             __annotations__ = {
                 "return": _return,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["return"], ]):
+    def __getitem__(self, name: typing.Literal["return", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -58,16 +55,15 @@ class ModelReturn(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ModelReturn':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index d92bffe6092..481513d11f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -48,7 +48,7 @@ class Money(
                 "amount": amount,
                 "currency": currency,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     amount: MetaOapg.properties.amount
     currency: 'Currency'
@@ -59,10 +59,7 @@ class Money(
     @typing.overload
     def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["amount"], typing.Literal["currency"], ]):
+    def __getitem__(self, name: typing.Literal["amount", "currency", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -70,6 +67,7 @@ class Money(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -77,7 +75,6 @@ class Money(
         amount: typing.Union[MetaOapg.properties.amount, str, ],
         currency: 'Currency',
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Money':
         return super().__new__(
             cls,
@@ -85,7 +82,6 @@ class Money(
             amount=amount,
             currency=currency,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.currency import Currency
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index d92bffe6092..481513d11f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -48,7 +48,7 @@ class Money(
                 "amount": amount,
                 "currency": currency,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     amount: MetaOapg.properties.amount
     currency: 'Currency'
@@ -59,10 +59,7 @@ class Money(
     @typing.overload
     def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["amount"], typing.Literal["currency"], ]):
+    def __getitem__(self, name: typing.Literal["amount", "currency", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -70,6 +67,7 @@ class Money(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -77,7 +75,6 @@ class Money(
         amount: typing.Union[MetaOapg.properties.amount, str, ],
         currency: 'Currency',
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Money':
         return super().__new__(
             cls,
@@ -85,7 +82,6 @@ class Money(
             amount=amount,
             currency=currency,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.currency import Currency
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 42fffb719b4..5780a50d7c5 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
@@ -47,7 +47,7 @@ class Name(
                 "snake_case": snake_case,
                 "property": _property,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     name: MetaOapg.properties.name
@@ -62,10 +62,7 @@ class Name(
     @typing.overload
     def __getitem__(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["snake_case"], typing.Literal["property"], ]):
+    def __getitem__(self, name: typing.Literal["name", "snake_case", "property", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,6 +70,7 @@ class Name(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -80,7 +78,6 @@ class Name(
         name: typing.Union[MetaOapg.properties.name, int, ],
         snake_case: typing.Union[MetaOapg.properties.snake_case, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Name':
         return super().__new__(
             cls,
@@ -88,5 +85,4 @@ class Name(
             name=name,
             snake_case=snake_case,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 42fffb719b4..5780a50d7c5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -47,7 +47,7 @@ class Name(
                 "snake_case": snake_case,
                 "property": _property,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     name: MetaOapg.properties.name
@@ -62,10 +62,7 @@ class Name(
     @typing.overload
     def __getitem__(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["snake_case"], typing.Literal["property"], ]):
+    def __getitem__(self, name: typing.Literal["name", "snake_case", "property", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -73,6 +70,7 @@ class Name(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -80,7 +78,6 @@ class Name(
         name: typing.Union[MetaOapg.properties.name, int, ],
         snake_case: typing.Union[MetaOapg.properties.snake_case, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Name':
         return super().__new__(
             cls,
@@ -88,5 +85,4 @@ class Name(
             name=name,
             snake_case=snake_case,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 8c0ea9c0ef9..397cf37d61b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -43,7 +43,28 @@ class NoAdditionalProperties(
                 "id": id,
                 "petId": petId,
             }
-        additional_properties = None
+        
+        
+        class additional_properties(
+            schemas.ComposedSchema,
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+                not_schema = schemas.AnyTypeSchema
+        
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'additional_properties':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
     
     id: MetaOapg.properties.id
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
@@ -54,7 +75,10 @@ class NoAdditionalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "petId", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,7 +86,6 @@ class NoAdditionalProperties(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
-    
 
     def __new__(
         cls,
@@ -70,6 +93,7 @@ class NoAdditionalProperties(
         id: typing.Union[MetaOapg.properties.id, int, ],
         petId: typing.Union[MetaOapg.properties.petId, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NoAdditionalProperties':
         return super().__new__(
             cls,
@@ -77,4 +101,5 @@ class NoAdditionalProperties(
             id=id,
             petId=petId,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 8c0ea9c0ef9..397cf37d61b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -43,7 +43,28 @@ class NoAdditionalProperties(
                 "id": id,
                 "petId": petId,
             }
-        additional_properties = None
+        
+        
+        class additional_properties(
+            schemas.ComposedSchema,
+        ):
+        
+        
+            class MetaOapg:
+                additional_properties = None
+                not_schema = schemas.AnyTypeSchema
+        
+        
+            def __new__(
+                cls,
+                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                _configuration: typing.Optional[schemas.Configuration] = None,
+            ) -> 'additional_properties':
+                return super().__new__(
+                    cls,
+                    *args,
+                    _configuration=_configuration,
+                )
     
     id: MetaOapg.properties.id
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
@@ -54,7 +75,10 @@ class NoAdditionalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "petId", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,7 +86,6 @@ class NoAdditionalProperties(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
-    
 
     def __new__(
         cls,
@@ -70,6 +93,7 @@ class NoAdditionalProperties(
         id: typing.Union[MetaOapg.properties.id, int, ],
         petId: typing.Union[MetaOapg.properties.petId, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NoAdditionalProperties':
         return super().__new__(
             cls,
@@ -77,4 +101,5 @@ class NoAdditionalProperties(
             id=id,
             petId=petId,
             _configuration=_configuration,
+            **kwargs,
         )
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 d0750b77398..dc709e28777 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
@@ -172,7 +172,26 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    items = schemas.DictSchema
+                    
+                    
+                    class items(
+                        schemas.DictSchema
+                    ):
+                    
+                    
+                        class MetaOapg:
+                            additional_properties = None
+                    
+                        def __new__(
+                            cls,
+                            *args: typing.Union[dict, frozendict.frozendict, ],
+                            _configuration: typing.Optional[schemas.Configuration] = None,
+                        ) -> 'items':
+                            return super().__new__(
+                                cls,
+                                *args,
+                                _configuration=_configuration,
+                            )
             
             
                 def __new__(
@@ -209,29 +228,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                         ) -> 'items':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
-                                **kwargs,
                             )
             
             
@@ -265,29 +273,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.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__(
@@ -315,7 +312,26 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.DictSchema
+                    
+                    
+                    class additional_properties(
+                        schemas.DictSchema
+                    ):
+                    
+                    
+                        class MetaOapg:
+                            additional_properties = None
+                    
+                        def __new__(
+                            cls,
+                            *args: typing.Union[dict, frozendict.frozendict, ],
+                            _configuration: typing.Optional[schemas.Configuration] = None,
+                        ) -> 'additional_properties':
+                            return super().__new__(
+                                cls,
+                                *args,
+                                _configuration=_configuration,
+                            )
             
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
@@ -363,29 +379,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
-                                **kwargs,
                             )
             
                 
@@ -430,29 +435,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
-                                **kwargs,
                             )
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
@@ -502,29 +496,18 @@ class NullableClass(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'additional_properties':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
-                    **kwargs,
                 )
     
     integer_prop: typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index d0750b77398..dc709e28777 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -172,7 +172,26 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    items = schemas.DictSchema
+                    
+                    
+                    class items(
+                        schemas.DictSchema
+                    ):
+                    
+                    
+                        class MetaOapg:
+                            additional_properties = None
+                    
+                        def __new__(
+                            cls,
+                            *args: typing.Union[dict, frozendict.frozendict, ],
+                            _configuration: typing.Optional[schemas.Configuration] = None,
+                        ) -> 'items':
+                            return super().__new__(
+                                cls,
+                                *args,
+                                _configuration=_configuration,
+                            )
             
             
                 def __new__(
@@ -209,29 +228,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                         ) -> 'items':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
-                                **kwargs,
                             )
             
             
@@ -265,29 +273,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.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__(
@@ -315,7 +312,26 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.DictSchema
+                    
+                    
+                    class additional_properties(
+                        schemas.DictSchema
+                    ):
+                    
+                    
+                        class MetaOapg:
+                            additional_properties = None
+                    
+                        def __new__(
+                            cls,
+                            *args: typing.Union[dict, frozendict.frozendict, ],
+                            _configuration: typing.Optional[schemas.Configuration] = None,
+                        ) -> 'additional_properties':
+                            return super().__new__(
+                                cls,
+                                *args,
+                                _configuration=_configuration,
+                            )
             
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
@@ -363,29 +379,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
-                                **kwargs,
                             )
             
                 
@@ -430,29 +435,18 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = schemas.AnyTypeSchema
-                    
-                        
-                        def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                            # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            additional_properties = None
+                    
                     
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
-                                **kwargs,
                             )
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
@@ -502,29 +496,18 @@ class NullableClass(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'additional_properties':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
-                    **kwargs,
                 )
     
     integer_prop: typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]
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 a171522724c..254951a11bb 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
@@ -35,7 +35,7 @@ class NullableShape(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_2 = schemas.NoneSchema
         
         @classmethod
@@ -55,27 +55,16 @@ class NullableShape(
                 cls.one_of_2,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NullableShape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
index a171522724c..254951a11bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
@@ -35,7 +35,7 @@ class NullableShape(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_2 = schemas.NoneSchema
         
         @classmethod
@@ -55,27 +55,16 @@ class NullableShape(
                 cls.one_of_2,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NullableShape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 1266c98657b..f9c54744049 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -38,17 +38,14 @@ class NumberOnly(
             __annotations__ = {
                 "JustNumber": JustNumber,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     JustNumber: typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["JustNumber"], ]):
+    def __getitem__(self, name: typing.Literal["JustNumber", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,18 +53,17 @@ class NumberOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         JustNumber: typing.Union[MetaOapg.properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
             *args,
             JustNumber=JustNumber,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 1266c98657b..f9c54744049 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -38,17 +38,14 @@ class NumberOnly(
             __annotations__ = {
                 "JustNumber": JustNumber,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     JustNumber: typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["JustNumber"], ]):
+    def __getitem__(self, name: typing.Literal["JustNumber", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,18 +53,17 @@ class NumberOnly(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         JustNumber: typing.Union[MetaOapg.properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
             *args,
             JustNumber=JustNumber,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
index 97a74edad7e..cdb8ec083e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
@@ -20,4 +20,28 @@ import uuid  # noqa: F401
 import frozendict  # noqa: F401
 
 from petstore_api import schemas  # noqa: F401
-ObjectInterface = schemas.DictSchema
+
+
+class ObjectInterface(
+    schemas.DictSchema
+):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+
+    class MetaOapg:
+        additional_properties = None
+
+    def __new__(
+        cls,
+        *args: typing.Union[dict, frozendict.frozendict, ],
+        _configuration: typing.Optional[schemas.Configuration] = None,
+    ) -> 'ObjectInterface':
+        return super().__new__(
+            cls,
+            *args,
+            _configuration=_configuration,
+        )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
index 97a74edad7e..cdb8ec083e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
@@ -20,4 +20,28 @@ import uuid  # noqa: F401
 import frozendict  # noqa: F401
 
 from petstore_api import schemas  # noqa: F401
-ObjectInterface = schemas.DictSchema
+
+
+class ObjectInterface(
+    schemas.DictSchema
+):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+
+    class MetaOapg:
+        additional_properties = None
+
+    def __new__(
+        cls,
+        *args: typing.Union[dict, frozendict.frozendict, ],
+        _configuration: typing.Optional[schemas.Configuration] = None,
+    ) -> 'ObjectInterface':
+        return super().__new__(
+            cls,
+            *args,
+            _configuration=_configuration,
+        )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index 7955df3bffa..5b1d9f010e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -48,7 +48,7 @@ class ObjectModelWithRefProps(
                 "myString": myString,
                 "myBoolean": myBoolean,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     myNumber: typing.Union['NumberWithValidations', schemas.Unset]
     myString: typing.Union[MetaOapg.properties.myString, schemas.Unset]
@@ -63,10 +63,7 @@ class ObjectModelWithRefProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["myNumber"], typing.Literal["myString"], typing.Literal["myBoolean"], ]):
+    def __getitem__(self, name: typing.Literal["myNumber", "myString", "myBoolean", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -74,6 +71,7 @@ class ObjectModelWithRefProps(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -82,7 +80,6 @@ class ObjectModelWithRefProps(
         myString: typing.Union[MetaOapg.properties.myString, str, schemas.Unset] = schemas.unset,
         myBoolean: typing.Union[MetaOapg.properties.myBoolean, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
@@ -91,7 +88,6 @@ class ObjectModelWithRefProps(
             myString=myString,
             myBoolean=myBoolean,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.number_with_validations import NumberWithValidations
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index 7955df3bffa..5b1d9f010e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -48,7 +48,7 @@ class ObjectModelWithRefProps(
                 "myString": myString,
                 "myBoolean": myBoolean,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     myNumber: typing.Union['NumberWithValidations', schemas.Unset]
     myString: typing.Union[MetaOapg.properties.myString, schemas.Unset]
@@ -63,10 +63,7 @@ class ObjectModelWithRefProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["myNumber"], typing.Literal["myString"], typing.Literal["myBoolean"], ]):
+    def __getitem__(self, name: typing.Literal["myNumber", "myString", "myBoolean", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -74,6 +71,7 @@ class ObjectModelWithRefProps(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -82,7 +80,6 @@ class ObjectModelWithRefProps(
         myString: typing.Union[MetaOapg.properties.myString, str, schemas.Unset] = schemas.unset,
         myBoolean: typing.Union[MetaOapg.properties.myBoolean, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
@@ -91,7 +88,6 @@ class ObjectModelWithRefProps(
             myString=myString,
             myBoolean=myBoolean,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.number_with_validations import NumberWithValidations
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index 8c53971c569..ff381c3807c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -46,7 +46,7 @@ class ObjectWithDecimalProperties(
                 "width": width,
                 "cost": cost,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     length: typing.Union[MetaOapg.properties.length, schemas.Unset]
     width: typing.Union[MetaOapg.properties.width, schemas.Unset]
@@ -61,10 +61,7 @@ class ObjectWithDecimalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["length"], typing.Literal["width"], typing.Literal["cost"], ]):
+    def __getitem__(self, name: typing.Literal["length", "width", "cost", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -72,6 +69,7 @@ class ObjectWithDecimalProperties(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -80,7 +78,6 @@ class ObjectWithDecimalProperties(
         width: typing.Union[MetaOapg.properties.width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['Money', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
@@ -89,7 +86,6 @@ class ObjectWithDecimalProperties(
             width=width,
             cost=cost,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.money import Money
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index 8c53971c569..ff381c3807c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -46,7 +46,7 @@ class ObjectWithDecimalProperties(
                 "width": width,
                 "cost": cost,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     length: typing.Union[MetaOapg.properties.length, schemas.Unset]
     width: typing.Union[MetaOapg.properties.width, schemas.Unset]
@@ -61,10 +61,7 @@ class ObjectWithDecimalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["length"], typing.Literal["width"], typing.Literal["cost"], ]):
+    def __getitem__(self, name: typing.Literal["length", "width", "cost", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -72,6 +69,7 @@ class ObjectWithDecimalProperties(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -80,7 +78,6 @@ class ObjectWithDecimalProperties(
         width: typing.Union[MetaOapg.properties.width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['Money', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
@@ -89,7 +86,6 @@ class ObjectWithDecimalProperties(
             width=width,
             cost=cost,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.money import Money
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index b5f65ed0770..fbfc4073321 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -47,7 +47,7 @@ class ObjectWithDifficultlyNamedProps(
                 "$special[property.name]": special_property_name,
                 "123Number": _123_number,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     
     @typing.overload
@@ -59,10 +59,7 @@ class ObjectWithDifficultlyNamedProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["123-list"], typing.Literal["$special[property.name]"], typing.Literal["123Number"], ]):
+    def __getitem__(self, name: typing.Literal["123-list", "$special[property.name]", "123Number", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -70,16 +67,15 @@ class ObjectWithDifficultlyNamedProps(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index b5f65ed0770..fbfc4073321 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -47,7 +47,7 @@ class ObjectWithDifficultlyNamedProps(
                 "$special[property.name]": special_property_name,
                 "123Number": _123_number,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     
     @typing.overload
@@ -59,10 +59,7 @@ class ObjectWithDifficultlyNamedProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["123-list"], typing.Literal["$special[property.name]"], typing.Literal["123Number"], ]):
+    def __getitem__(self, name: typing.Literal["123-list", "$special[property.name]", "123Number", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -70,16 +67,15 @@ class ObjectWithDifficultlyNamedProps(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
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 c6cb149931f..d3613ff7589 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
@@ -42,7 +42,7 @@ class ObjectWithInlineCompositionProperty(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -68,42 +68,28 @@ class ObjectWithInlineCompositionProperty(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -111,18 +97,17 @@ class ObjectWithInlineCompositionProperty(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 48dd8487432..1a1f686aeec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -42,7 +42,7 @@ class ObjectWithInlineCompositionProperty(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -65,42 +65,28 @@ class ObjectWithInlineCompositionProperty(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -108,18 +94,17 @@ class ObjectWithInlineCompositionProperty(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
index 7179c146f00..f5464ccbd2f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
@@ -33,27 +33,16 @@ class ObjectWithValidations(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         min_properties = 2
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
index d9802550569..4b4c8249b00 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
@@ -33,26 +33,15 @@ class ObjectWithValidations(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        additional_properties = None
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index 91d7d8ce8ad..ac3bb642020 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -74,7 +74,7 @@ class Order(
                 "status": status,
                 "complete": complete,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
@@ -101,10 +101,7 @@ class Order(
     @typing.overload
     def __getitem__(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["petId"], typing.Literal["quantity"], typing.Literal["shipDate"], typing.Literal["status"], typing.Literal["complete"], ]):
+    def __getitem__(self, name: typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -112,6 +109,7 @@ class Order(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -123,7 +121,6 @@ class Order(
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         complete: typing.Union[MetaOapg.properties.complete, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Order':
         return super().__new__(
             cls,
@@ -135,5 +132,4 @@ class Order(
             status=status,
             complete=complete,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index 91d7d8ce8ad..ac3bb642020 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -74,7 +74,7 @@ class Order(
                 "status": status,
                 "complete": complete,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
@@ -101,10 +101,7 @@ class Order(
     @typing.overload
     def __getitem__(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["petId"], typing.Literal["quantity"], typing.Literal["shipDate"], typing.Literal["status"], typing.Literal["complete"], ]):
+    def __getitem__(self, name: typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -112,6 +109,7 @@ class Order(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -123,7 +121,6 @@ class Order(
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         complete: typing.Union[MetaOapg.properties.complete, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Order':
         return super().__new__(
             cls,
@@ -135,5 +132,4 @@ class Order(
             status=status,
             complete=complete,
             _configuration=_configuration,
-            **kwargs,
         )
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 ee1066b692f..b92c08bca72 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
@@ -43,7 +43,7 @@ class ParentPet(
                     'ChildCat': ChildCat,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -60,27 +60,16 @@ class ParentPet(
                 GrandparentAnimal,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ParentPet':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
index ee1066b692f..b92c08bca72 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
@@ -43,7 +43,7 @@ class ParentPet(
                     'ChildCat': ChildCat,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -60,27 +60,16 @@ class ParentPet(
                 GrandparentAnimal,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ParentPet':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
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 7441ceaaf17..e45dbbe7838 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
@@ -132,7 +132,7 @@ class Pet(
                 "tags": tags,
                 "status": status,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     photoUrls: MetaOapg.properties.photoUrls
     name: MetaOapg.properties.name
@@ -142,10 +142,10 @@ class Pet(
     status: typing.Union[MetaOapg.properties.status, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
@@ -159,10 +159,7 @@ class Pet(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["photoUrls"], typing.Literal["name"], typing.Literal["id"], typing.Literal["category"], typing.Literal["tags"], typing.Literal["status"], ]):
+    def __getitem__(self, name: typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -170,6 +167,7 @@ class Pet(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -181,7 +179,6 @@ class Pet(
         tags: typing.Union[MetaOapg.properties.tags, tuple, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Pet':
         return super().__new__(
             cls,
@@ -193,7 +190,6 @@ class Pet(
             tags=tags,
             status=status,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.category import Category
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index 7441ceaaf17..e45dbbe7838 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -132,7 +132,7 @@ class Pet(
                 "tags": tags,
                 "status": status,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     photoUrls: MetaOapg.properties.photoUrls
     name: MetaOapg.properties.name
@@ -142,10 +142,10 @@ class Pet(
     status: typing.Union[MetaOapg.properties.status, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
@@ -159,10 +159,7 @@ class Pet(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["photoUrls"], typing.Literal["name"], typing.Literal["id"], typing.Literal["category"], typing.Literal["tags"], typing.Literal["status"], ]):
+    def __getitem__(self, name: typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -170,6 +167,7 @@ class Pet(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -181,7 +179,6 @@ class Pet(
         tags: typing.Union[MetaOapg.properties.tags, tuple, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Pet':
         return super().__new__(
             cls,
@@ -193,7 +190,6 @@ class Pet(
             tags=tags,
             status=status,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.category import Category
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 e03e9e5f26d..ab1e072edf7 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
@@ -43,7 +43,7 @@ class Pig(
                     'DanishPig': DanishPig,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -61,27 +61,16 @@ class Pig(
                 DanishPig,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Pig':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.basque_pig import BasquePig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
index e03e9e5f26d..ab1e072edf7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
@@ -43,7 +43,7 @@ class Pig(
                     'DanishPig': DanishPig,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -61,27 +61,16 @@ class Pig(
                 DanishPig,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Pig':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.basque_pig import BasquePig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 349ae10c245..177d9e24051 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -46,7 +46,7 @@ class Player(
                 "name": name,
                 "enemyPlayer": enemyPlayer,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     enemyPlayer: typing.Union['Player', schemas.Unset]
@@ -57,10 +57,7 @@ class Player(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["enemyPlayer"], ]):
+    def __getitem__(self, name: typing.Literal["name", "enemyPlayer", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -68,6 +65,7 @@ class Player(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -75,7 +73,6 @@ class Player(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Player':
         return super().__new__(
             cls,
@@ -83,5 +80,4 @@ class Player(
             name=name,
             enemyPlayer=enemyPlayer,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 349ae10c245..177d9e24051 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -46,7 +46,7 @@ class Player(
                 "name": name,
                 "enemyPlayer": enemyPlayer,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     enemyPlayer: typing.Union['Player', schemas.Unset]
@@ -57,10 +57,7 @@ class Player(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["enemyPlayer"], ]):
+    def __getitem__(self, name: typing.Literal["name", "enemyPlayer", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -68,6 +65,7 @@ class Player(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -75,7 +73,6 @@ class Player(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Player':
         return super().__new__(
             cls,
@@ -83,5 +80,4 @@ class Player(
             name=name,
             enemyPlayer=enemyPlayer,
             _configuration=_configuration,
-            **kwargs,
         )
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 b84d132b611..4f11f91edd0 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
@@ -43,7 +43,7 @@ class Quadrilateral(
                     'SimpleQuadrilateral': SimpleQuadrilateral,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -61,27 +61,16 @@ class Quadrilateral(
                 ComplexQuadrilateral,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.complex_quadrilateral import ComplexQuadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
index b84d132b611..4f11f91edd0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
@@ -43,7 +43,7 @@ class Quadrilateral(
                     'SimpleQuadrilateral': SimpleQuadrilateral,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -61,27 +61,16 @@ class Quadrilateral(
                 ComplexQuadrilateral,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.complex_quadrilateral import ComplexQuadrilateral
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 9774b501fd9..34e339d3b4b 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
@@ -58,7 +58,7 @@ class QuadrilateralInterface(
                 "shapeType": shapeType,
                 "quadrilateralType": quadrilateralType,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
@@ -70,10 +70,7 @@ class QuadrilateralInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["shapeType"], typing.Literal["quadrilateralType"], ]):
+    def __getitem__(self, name: typing.Literal["shapeType", "quadrilateralType", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -81,6 +78,7 @@ class QuadrilateralInterface(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -88,7 +86,6 @@ class QuadrilateralInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
@@ -96,5 +93,4 @@ class QuadrilateralInterface(
             shapeType=shapeType,
             quadrilateralType=quadrilateralType,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 9774b501fd9..34e339d3b4b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -58,7 +58,7 @@ class QuadrilateralInterface(
                 "shapeType": shapeType,
                 "quadrilateralType": quadrilateralType,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
@@ -70,10 +70,7 @@ class QuadrilateralInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["shapeType"], typing.Literal["quadrilateralType"], ]):
+    def __getitem__(self, name: typing.Literal["shapeType", "quadrilateralType", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -81,6 +78,7 @@ class QuadrilateralInterface(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -88,7 +86,6 @@ class QuadrilateralInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
@@ -96,5 +93,4 @@ class QuadrilateralInterface(
             shapeType=shapeType,
             quadrilateralType=quadrilateralType,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index f931b897bd0..f1b8805f6ed 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -40,7 +40,7 @@ class ReadOnlyFirst(
                 "bar": bar,
                 "baz": baz,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     baz: typing.Union[MetaOapg.properties.baz, schemas.Unset]
@@ -51,10 +51,7 @@ class ReadOnlyFirst(
     @typing.overload
     def __getitem__(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["baz"], ]):
+    def __getitem__(self, name: typing.Literal["bar", "baz", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,6 +59,7 @@ class ReadOnlyFirst(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -69,7 +67,6 @@ class ReadOnlyFirst(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         baz: typing.Union[MetaOapg.properties.baz, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
@@ -77,5 +74,4 @@ class ReadOnlyFirst(
             bar=bar,
             baz=baz,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index f931b897bd0..f1b8805f6ed 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -40,7 +40,7 @@ class ReadOnlyFirst(
                 "bar": bar,
                 "baz": baz,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     baz: typing.Union[MetaOapg.properties.baz, schemas.Unset]
@@ -51,10 +51,7 @@ class ReadOnlyFirst(
     @typing.overload
     def __getitem__(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["baz"], ]):
+    def __getitem__(self, name: typing.Literal["bar", "baz", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,6 +59,7 @@ class ReadOnlyFirst(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -69,7 +67,6 @@ class ReadOnlyFirst(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         baz: typing.Union[MetaOapg.properties.baz, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
@@ -77,5 +74,4 @@ class ReadOnlyFirst(
             bar=bar,
             baz=baz,
             _configuration=_configuration,
-            **kwargs,
         )
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 c7995f0cb04..013a6192bb5 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
@@ -33,7 +33,7 @@ class ScaleneTriangle(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class ScaleneTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["triangleType"], ]):
+            def __getitem__(self, name: typing.Literal["triangleType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class ScaleneTriangle(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class ScaleneTriangle(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index c7995f0cb04..013a6192bb5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -33,7 +33,7 @@ class ScaleneTriangle(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class ScaleneTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["triangleType"], ]):
+            def __getitem__(self, name: typing.Literal["triangleType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class ScaleneTriangle(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class ScaleneTriangle(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
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 4c4b8440ef9..b5dba7a727f 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
@@ -43,7 +43,7 @@ class Shape(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -61,27 +61,16 @@ class Shape(
                 Quadrilateral,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Shape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
index 4c4b8440ef9..b5dba7a727f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
@@ -43,7 +43,7 @@ class Shape(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -61,27 +61,16 @@ class Shape(
                 Quadrilateral,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Shape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
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 f3810b232af..ab53fa87803 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
@@ -45,7 +45,7 @@ class ShapeOrNull(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
@@ -65,27 +65,16 @@ class ShapeOrNull(
                 Quadrilateral,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
index f3810b232af..ab53fa87803 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
@@ -45,7 +45,7 @@ class ShapeOrNull(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
@@ -65,27 +65,16 @@ class ShapeOrNull(
                 Quadrilateral,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
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 8ad1afe7fe7..0fd2caece64 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
@@ -33,7 +33,7 @@ class SimpleQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class SimpleQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["quadrilateralType"], ]):
+            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class SimpleQuadrilateral(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class SimpleQuadrilateral(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index 8ad1afe7fe7..0fd2caece64 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -33,7 +33,7 @@ class SimpleQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_1(
@@ -61,17 +61,14 @@ class SimpleQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = schemas.AnyTypeSchema
+                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["quadrilateralType"], ]):
+            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
@@ -79,20 +76,19 @@ class SimpleQuadrilateral(
                     return super().__getitem__(name)
                 except KeyError:
                     return schemas.unset
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
-                    **kwargs,
                 )
         
         @classmethod
@@ -111,27 +107,16 @@ class SimpleQuadrilateral(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
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 16beb7d34be..a9f83a82247 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
@@ -33,7 +33,7 @@ class SomeObject(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -50,27 +50,16 @@ class SomeObject(
                 ObjectInterface,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SomeObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.object_interface import ObjectInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
index 16beb7d34be..a9f83a82247 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
@@ -33,7 +33,7 @@ class SomeObject(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -50,27 +50,16 @@ class SomeObject(
                 ObjectInterface,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SomeObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.object_interface import ObjectInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 95a09e0e7a1..15d49a355b7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -40,17 +40,14 @@ class SpecialModelName(
             __annotations__ = {
                 "a": a,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     a: typing.Union[MetaOapg.properties.a, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["a"], ]):
+    def __getitem__(self, name: typing.Literal["a", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -58,18 +55,17 @@ class SpecialModelName(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         a: typing.Union[MetaOapg.properties.a, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
             *args,
             a=a,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 95a09e0e7a1..15d49a355b7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -40,17 +40,14 @@ class SpecialModelName(
             __annotations__ = {
                 "a": a,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     a: typing.Union[MetaOapg.properties.a, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["a"], ]):
+    def __getitem__(self, name: typing.Literal["a", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -58,18 +55,17 @@ class SpecialModelName(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         a: typing.Union[MetaOapg.properties.a, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
             *args,
             a=a,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index 4f6394ff7fd..e3548b510ed 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -40,7 +40,7 @@ class Tag(
                 "id": id,
                 "name": name,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
@@ -51,10 +51,7 @@ class Tag(
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["name"], ]):
+    def __getitem__(self, name: typing.Literal["id", "name", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,6 +59,7 @@ class Tag(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -69,7 +67,6 @@ class Tag(
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Tag':
         return super().__new__(
             cls,
@@ -77,5 +74,4 @@ class Tag(
             id=id,
             name=name,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index 4f6394ff7fd..e3548b510ed 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -40,7 +40,7 @@ class Tag(
                 "id": id,
                 "name": name,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
@@ -51,10 +51,7 @@ class Tag(
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["name"], ]):
+    def __getitem__(self, name: typing.Literal["id", "name", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,6 +59,7 @@ class Tag(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -69,7 +67,6 @@ class Tag(
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Tag':
         return super().__new__(
             cls,
@@ -77,5 +74,4 @@ class Tag(
             id=id,
             name=name,
             _configuration=_configuration,
-            **kwargs,
         )
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 30b21739bb2..c371addec0c 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
@@ -44,7 +44,7 @@ class Triangle(
                     'ScaleneTriangle': ScaleneTriangle,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -63,27 +63,16 @@ class Triangle(
                 ScaleneTriangle,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Triangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.equilateral_triangle import EquilateralTriangle
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
index 30b21739bb2..c371addec0c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
@@ -44,7 +44,7 @@ class Triangle(
                     'ScaleneTriangle': ScaleneTriangle,
                 }
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         @classmethod
         @property
@@ -63,27 +63,16 @@ class Triangle(
                 ScaleneTriangle,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Triangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 from petstore_api.model.equilateral_triangle import EquilateralTriangle
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 bcc265e0bfa..065338f5f27 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
@@ -58,7 +58,7 @@ class TriangleInterface(
                 "shapeType": shapeType,
                 "triangleType": triangleType,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
@@ -70,10 +70,7 @@ class TriangleInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["shapeType"], typing.Literal["triangleType"], ]):
+    def __getitem__(self, name: typing.Literal["shapeType", "triangleType", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -81,6 +78,7 @@ class TriangleInterface(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -88,7 +86,6 @@ class TriangleInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         triangleType: typing.Union[MetaOapg.properties.triangleType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
@@ -96,5 +93,4 @@ class TriangleInterface(
             shapeType=shapeType,
             triangleType=triangleType,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index bcc265e0bfa..065338f5f27 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -58,7 +58,7 @@ class TriangleInterface(
                 "shapeType": shapeType,
                 "triangleType": triangleType,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
@@ -70,10 +70,7 @@ class TriangleInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["shapeType"], typing.Literal["triangleType"], ]):
+    def __getitem__(self, name: typing.Literal["shapeType", "triangleType", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -81,6 +78,7 @@ class TriangleInterface(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -88,7 +86,6 @@ class TriangleInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         triangleType: typing.Union[MetaOapg.properties.triangleType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
@@ -96,5 +93,4 @@ class TriangleInterface(
             shapeType=shapeType,
             triangleType=triangleType,
             _configuration=_configuration,
-            **kwargs,
         )
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 8b52aa02aa3..aef9cc9f880 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
@@ -42,7 +42,26 @@ class User(
             password = schemas.StrSchema
             phone = schemas.StrSchema
             userStatus = schemas.Int32Schema
-            objectWithNoDeclaredProps = schemas.DictSchema
+            
+            
+            class objectWithNoDeclaredProps(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    additional_properties = None
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                ) -> 'objectWithNoDeclaredProps':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                    )
             
             
             class objectWithNoDeclaredPropsNullable(
@@ -55,29 +74,18 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
-            
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    additional_properties = None
+            
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, None, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'objectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             anyTypeProp = schemas.AnyTypeSchema
             
@@ -88,30 +96,19 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     not_schema = schemas.NoneSchema
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'anyTypeExceptNullProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             anyTypePropNullable = schemas.AnyTypeSchema
             __annotations__ = {
@@ -129,7 +126,7 @@ class User(
                 "anyTypeExceptNullProp": anyTypeExceptNullProp,
                 "anyTypePropNullable": anyTypePropNullable,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     username: typing.Union[MetaOapg.properties.username, schemas.Unset]
@@ -184,10 +181,7 @@ class User(
     @typing.overload
     def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["username"], typing.Literal["firstName"], typing.Literal["lastName"], typing.Literal["email"], typing.Literal["password"], typing.Literal["phone"], typing.Literal["userStatus"], typing.Literal["objectWithNoDeclaredProps"], typing.Literal["objectWithNoDeclaredPropsNullable"], typing.Literal["anyTypeProp"], typing.Literal["anyTypeExceptNullProp"], typing.Literal["anyTypePropNullable"], ]):
+    def __getitem__(self, name: typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -195,6 +189,7 @@ class User(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -213,7 +208,6 @@ class User(
         anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'User':
         return super().__new__(
             cls,
@@ -232,5 +226,4 @@ class User(
             anyTypeExceptNullProp=anyTypeExceptNullProp,
             anyTypePropNullable=anyTypePropNullable,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index 8b52aa02aa3..aef9cc9f880 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -42,7 +42,26 @@ class User(
             password = schemas.StrSchema
             phone = schemas.StrSchema
             userStatus = schemas.Int32Schema
-            objectWithNoDeclaredProps = schemas.DictSchema
+            
+            
+            class objectWithNoDeclaredProps(
+                schemas.DictSchema
+            ):
+            
+            
+                class MetaOapg:
+                    additional_properties = None
+            
+                def __new__(
+                    cls,
+                    *args: typing.Union[dict, frozendict.frozendict, ],
+                    _configuration: typing.Optional[schemas.Configuration] = None,
+                ) -> 'objectWithNoDeclaredProps':
+                    return super().__new__(
+                        cls,
+                        *args,
+                        _configuration=_configuration,
+                    )
             
             
             class objectWithNoDeclaredPropsNullable(
@@ -55,29 +74,18 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
-            
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    additional_properties = None
+            
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, None, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'objectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             anyTypeProp = schemas.AnyTypeSchema
             
@@ -88,30 +96,19 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     not_schema = schemas.NoneSchema
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'anyTypeExceptNullProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             anyTypePropNullable = schemas.AnyTypeSchema
             __annotations__ = {
@@ -129,7 +126,7 @@ class User(
                 "anyTypeExceptNullProp": anyTypeExceptNullProp,
                 "anyTypePropNullable": anyTypePropNullable,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     username: typing.Union[MetaOapg.properties.username, schemas.Unset]
@@ -184,10 +181,7 @@ class User(
     @typing.overload
     def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["username"], typing.Literal["firstName"], typing.Literal["lastName"], typing.Literal["email"], typing.Literal["password"], typing.Literal["phone"], typing.Literal["userStatus"], typing.Literal["objectWithNoDeclaredProps"], typing.Literal["objectWithNoDeclaredPropsNullable"], typing.Literal["anyTypeProp"], typing.Literal["anyTypeExceptNullProp"], typing.Literal["anyTypePropNullable"], ]):
+    def __getitem__(self, name: typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -195,6 +189,7 @@ class User(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -213,7 +208,6 @@ class User(
         anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'User':
         return super().__new__(
             cls,
@@ -232,5 +226,4 @@ class User(
             anyTypeExceptNullProp=anyTypeExceptNullProp,
             anyTypePropNullable=anyTypePropNullable,
             _configuration=_configuration,
-            **kwargs,
         )
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 97adbc56e3b..ed90d5e64b6 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
@@ -59,7 +59,7 @@ class Whale(
                 "hasBaleen": hasBaleen,
                 "hasTeeth": hasTeeth,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]
@@ -74,10 +74,7 @@ class Whale(
     @typing.overload
     def __getitem__(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], typing.Literal["hasBaleen"], typing.Literal["hasTeeth"], ]):
+    def __getitem__(self, name: typing.Literal["className", "hasBaleen", "hasTeeth", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -85,6 +82,7 @@ class Whale(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -93,7 +91,6 @@ class Whale(
         hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, bool, schemas.Unset] = schemas.unset,
         hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Whale':
         return super().__new__(
             cls,
@@ -102,5 +99,4 @@ class Whale(
             hasBaleen=hasBaleen,
             hasTeeth=hasTeeth,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index 97adbc56e3b..ed90d5e64b6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -59,7 +59,7 @@ class Whale(
                 "hasBaleen": hasBaleen,
                 "hasTeeth": hasTeeth,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     className: MetaOapg.properties.className
     hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]
@@ -74,10 +74,7 @@ class Whale(
     @typing.overload
     def __getitem__(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], typing.Literal["hasBaleen"], typing.Literal["hasTeeth"], ]):
+    def __getitem__(self, name: typing.Literal["className", "hasBaleen", "hasTeeth", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -85,6 +82,7 @@ class Whale(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -93,7 +91,6 @@ class Whale(
         hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, bool, schemas.Unset] = schemas.unset,
         hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'Whale':
         return super().__new__(
             cls,
@@ -102,5 +99,4 @@ class Whale(
             hasBaleen=hasBaleen,
             hasTeeth=hasTeeth,
             _configuration=_configuration,
-            **kwargs,
         )
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 1194e5df7de..b6f9b7b986b 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
@@ -147,7 +147,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "password": password,
                 "callback": callback,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     number: MetaOapg.properties.number
     pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter
@@ -164,31 +164,31 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     callback: typing.Union[MetaOapg.properties.callback, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
@@ -205,10 +205,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["number"], typing.Literal["pattern_without_delimiter"], typing.Literal["byte"], typing.Literal["double"], typing.Literal["integer"], typing.Literal["int32"], typing.Literal["int64"], typing.Literal["float"], typing.Literal["string"], typing.Literal["binary"], typing.Literal["date"], typing.Literal["dateTime"], typing.Literal["password"], typing.Literal["callback"], ]):
+    def __getitem__(self, name: typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -216,6 +213,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -234,7 +232,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         password: typing.Union[MetaOapg.properties.password, str, schemas.Unset] = schemas.unset,
         callback: typing.Union[MetaOapg.properties.callback, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -253,7 +250,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             password=password,
             callback=callback,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index f08c95ae41d..3f21a3aa58d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -109,7 +109,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "password": password,
                 "callback": callback,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     number: MetaOapg.properties.number
     pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter
@@ -126,31 +126,31 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     callback: typing.Union[MetaOapg.properties.callback, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
@@ -167,10 +167,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["number"], typing.Literal["pattern_without_delimiter"], typing.Literal["byte"], typing.Literal["double"], typing.Literal["integer"], typing.Literal["int32"], typing.Literal["int64"], typing.Literal["float"], typing.Literal["string"], typing.Literal["binary"], typing.Literal["date"], typing.Literal["dateTime"], typing.Literal["password"], typing.Literal["callback"], ]):
+    def __getitem__(self, name: typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -178,6 +175,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -196,7 +194,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         password: typing.Union[MetaOapg.properties.password, str, schemas.Unset] = schemas.unset,
         callback: typing.Union[MetaOapg.properties.callback, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -215,7 +212,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             password=password,
             callback=callback,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
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 d82f949f165..26bf015f33a 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
@@ -367,7 +367,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string_array": enum_form_string_array,
                 "enum_form_string": enum_form_string,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]
     enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]
@@ -378,10 +378,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["enum_form_string_array"], typing.Literal["enum_form_string"], ]):
+    def __getitem__(self, name: typing.Literal["enum_form_string_array", "enum_form_string", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -389,6 +386,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -396,7 +394,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, tuple, schemas.Unset] = schemas.unset,
         enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -404,7 +401,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             enum_form_string_array=enum_form_string_array,
             enum_form_string=enum_form_string,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 18a3210f14f..fbc479ed46f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -291,7 +291,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string_array": enum_form_string_array,
                 "enum_form_string": enum_form_string,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]
     enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]
@@ -302,10 +302,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["enum_form_string_array"], typing.Literal["enum_form_string"], ]):
+    def __getitem__(self, name: typing.Literal["enum_form_string_array", "enum_form_string", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -313,6 +310,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -320,7 +318,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, tuple, schemas.Unset] = schemas.unset,
         enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -328,7 +325,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             enum_form_string_array=enum_form_string_array,
             enum_form_string=enum_form_string,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
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 a26561b691a..808ee90145f 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
@@ -34,7 +34,7 @@ class CompositionAtRootSchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_0(
@@ -60,27 +60,16 @@ class CompositionAtRootSchema(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'CompositionAtRootSchema':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -99,7 +88,7 @@ class CompositionInPropertySchema(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -125,42 +114,28 @@ class CompositionInPropertySchema(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -168,20 +143,19 @@ class CompositionInPropertySchema(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'CompositionInPropertySchema':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
 RequestRequiredQueryParams = typing.TypedDict(
     'RequestRequiredQueryParams',
@@ -223,7 +197,7 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_0(
@@ -249,27 +223,16 @@ class SchemaForRequestBodyApplicationJson(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -288,7 +251,7 @@ class SchemaForRequestBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -314,42 +277,28 @@ class SchemaForRequestBodyMultipartFormData(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -357,20 +306,19 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -390,7 +338,7 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_0(
@@ -416,27 +364,16 @@ class SchemaFor200ResponseBodyApplicationJson(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -455,7 +392,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -481,42 +418,28 @@ class SchemaFor200ResponseBodyMultipartFormData(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -524,20 +447,19 @@ class SchemaFor200ResponseBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaFor200ResponseBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 8e9e507e69b..5fdbbdce262 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -32,7 +32,7 @@ class CompositionAtRootSchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_0(
@@ -55,27 +55,16 @@ class CompositionAtRootSchema(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'CompositionAtRootSchema':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -94,7 +83,7 @@ class CompositionInPropertySchema(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -117,42 +106,28 @@ class CompositionInPropertySchema(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -160,20 +135,19 @@ class CompositionInPropertySchema(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'CompositionInPropertySchema':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
 # body param
 
@@ -184,7 +158,7 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_0(
@@ -207,27 +181,16 @@ class SchemaForRequestBodyApplicationJson(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -246,7 +209,7 @@ class SchemaForRequestBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -269,42 +232,28 @@ class SchemaForRequestBodyMultipartFormData(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -312,20 +261,19 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -335,7 +283,7 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
         
         
         class all_of_0(
@@ -358,27 +306,16 @@ class SchemaFor200ResponseBodyApplicationJson(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
@@ -397,7 +334,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
+                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -420,42 +357,28 @@ class SchemaFor200ResponseBodyMultipartFormData(
                             cls.all_of_0,
                         ]
             
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["someProp"], ]):
+    def __getitem__(self, name: typing.Literal["someProp", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -463,20 +386,19 @@ class SchemaFor200ResponseBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaFor200ResponseBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
-            **kwargs,
         )
 _all_accept_content_types = (
     'application/json',
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index 125c1d16452..b0575462ed9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -45,7 +45,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "param": param,
                 "param2": param2,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     param: MetaOapg.properties.param
     param2: MetaOapg.properties.param2
@@ -56,10 +56,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["param"], typing.Literal["param2"], ]):
+    def __getitem__(self, name: typing.Literal["param", "param2", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -67,6 +64,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -74,7 +72,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         param: typing.Union[MetaOapg.properties.param, str, ],
         param2: typing.Union[MetaOapg.properties.param2, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -82,7 +79,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             param=param,
             param2=param2,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 8466bb2a715..83ce9f450e1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -43,7 +43,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "param": param,
                 "param2": param2,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     param: MetaOapg.properties.param
     param2: MetaOapg.properties.param2
@@ -54,10 +54,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["param"], typing.Literal["param2"], ]):
+    def __getitem__(self, name: typing.Literal["param", "param2", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -65,6 +62,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -72,7 +70,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         param: typing.Union[MetaOapg.properties.param, str, ],
         param2: typing.Union[MetaOapg.properties.param2, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -80,7 +77,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             param=param,
             param2=param2,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index 21074a799cc..9e20a4d1505 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -38,17 +38,14 @@ class MapBeanSchema(
             __annotations__ = {
                 "keyword": keyword,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     keyword: typing.Union[MetaOapg.properties.keyword, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["keyword"], ]):
+    def __getitem__(self, name: typing.Literal["keyword", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -56,20 +53,19 @@ class MapBeanSchema(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         keyword: typing.Union[MetaOapg.properties.keyword, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'MapBeanSchema':
         return super().__new__(
             cls,
             *args,
             keyword=keyword,
             _configuration=_configuration,
-            **kwargs,
         )
 RequestRequiredQueryParams = typing.TypedDict(
     'RequestRequiredQueryParams',
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index 22f5e41360b..b02a13888de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -36,17 +36,14 @@ class MapBeanSchema(
             __annotations__ = {
                 "keyword": keyword,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     keyword: typing.Union[MetaOapg.properties.keyword, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["keyword"], ]):
+    def __getitem__(self, name: typing.Literal["keyword", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -54,20 +51,19 @@ class MapBeanSchema(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         keyword: typing.Union[MetaOapg.properties.keyword, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'MapBeanSchema':
         return super().__new__(
             cls,
             *args,
             keyword=keyword,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
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 51d2ddd7e08..4b946673b57 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
@@ -72,21 +72,18 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "requiredFile": requiredFile,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     requiredFile: MetaOapg.properties.requiredFile
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["requiredFile"], typing.Literal["additionalMetadata"], ]):
+    def __getitem__(self, name: typing.Literal["additionalMetadata", "requiredFile", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -94,6 +91,7 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -101,7 +99,6 @@ class SchemaForRequestBodyMultipartFormData(
         requiredFile: typing.Union[MetaOapg.properties.requiredFile, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -109,7 +106,6 @@ class SchemaForRequestBodyMultipartFormData(
             requiredFile=requiredFile,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index c7403528ee5..004e0194956 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -46,21 +46,18 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "requiredFile": requiredFile,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     requiredFile: MetaOapg.properties.requiredFile
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["requiredFile"], typing.Literal["additionalMetadata"], ]):
+    def __getitem__(self, name: typing.Literal["additionalMetadata", "requiredFile", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -68,6 +65,7 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -75,7 +73,6 @@ class SchemaForRequestBodyMultipartFormData(
         requiredFile: typing.Union[MetaOapg.properties.requiredFile, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -83,7 +80,6 @@ class SchemaForRequestBodyMultipartFormData(
             requiredFile=requiredFile,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
-            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
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 eba54f259fd..51e89493bb4 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
@@ -46,21 +46,18 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     file: MetaOapg.properties.file
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["file"], typing.Literal["additionalMetadata"], ]):
+    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -68,6 +65,7 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -75,7 +73,6 @@ class SchemaForRequestBodyMultipartFormData(
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -83,7 +80,6 @@ class SchemaForRequestBodyMultipartFormData(
             file=file,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index 534bed35702..e1258163e18 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -44,21 +44,18 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     file: MetaOapg.properties.file
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["file"], typing.Literal["additionalMetadata"], ]):
+    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -66,6 +63,7 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -73,7 +71,6 @@ class SchemaForRequestBodyMultipartFormData(
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -81,7 +78,6 @@ class SchemaForRequestBodyMultipartFormData(
             file=file,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
-            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
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 c525f304058..e428452882e 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
@@ -63,17 +63,14 @@ class SchemaForRequestBodyMultipartFormData(
             __annotations__ = {
                 "files": files,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["files"], ]):
+    def __getitem__(self, name: typing.Literal["files", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -81,20 +78,19 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             files=files,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index ebf5f6a7294..9c8f4857169 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -61,17 +61,14 @@ class SchemaForRequestBodyMultipartFormData(
             __annotations__ = {
                 "files": files,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["files"], ]):
+    def __getitem__(self, name: typing.Literal["files", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -79,20 +76,19 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             files=files,
             _configuration=_configuration,
-            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index c002af8a7a0..26bc88557f2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -44,17 +44,14 @@ class SchemaFor0ResponseBodyApplicationJson(
             __annotations__ = {
                 "string": string,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     string: typing.Union['Foo', schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["string"], ]):
+    def __getitem__(self, name: typing.Literal["string", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -62,20 +59,19 @@ class SchemaFor0ResponseBodyApplicationJson(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['Foo', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaFor0ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             string=string,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index bfe6511640f..64b3e48e1e6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -42,17 +42,14 @@ class SchemaFor0ResponseBodyApplicationJson(
             __annotations__ = {
                 "string": string,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     string: typing.Union['Foo', schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["string"], ]):
+    def __getitem__(self, name: typing.Literal["string", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -60,20 +57,19 @@ class SchemaFor0ResponseBodyApplicationJson(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['Foo', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaFor0ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             string=string,
             _configuration=_configuration,
-            **kwargs,
         )
 _all_accept_content_types = (
     'application/json',
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index e04ef89863a..4f80b52283d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -67,7 +67,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "name": name,
                 "status": status,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     status: typing.Union[MetaOapg.properties.status, schemas.Unset]
@@ -78,10 +78,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["status"], ]):
+    def __getitem__(self, name: typing.Literal["name", "status", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -89,6 +86,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -96,7 +94,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -104,7 +101,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             name=name,
             status=status,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index 63cacffeaee..e4f65fb12e0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -41,7 +41,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "name": name,
                 "status": status,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     status: typing.Union[MetaOapg.properties.status, schemas.Unset]
@@ -52,10 +52,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["name"], typing.Literal["status"], ]):
+    def __getitem__(self, name: typing.Literal["name", "status", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -63,6 +60,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -70,7 +68,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -78,7 +75,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             name=name,
             status=status,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 57dbf615849..0d66c6982e8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -69,7 +69,7 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     file: typing.Union[MetaOapg.properties.file, schemas.Unset]
@@ -80,10 +80,7 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["additionalMetadata"], typing.Literal["file"], ]):
+    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -91,6 +88,7 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -98,7 +96,6 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -106,7 +103,6 @@ class SchemaForRequestBodyMultipartFormData(
             additionalMetadata=additionalMetadata,
             file=file,
             _configuration=_configuration,
-            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index f309adadfe7..3419f62c662 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -43,7 +43,7 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = schemas.AnyTypeSchema
+        additional_properties = None
     
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     file: typing.Union[MetaOapg.properties.file, schemas.Unset]
@@ -54,10 +54,7 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["additionalMetadata"], typing.Literal["file"], ]):
+    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -65,6 +62,7 @@ class SchemaForRequestBodyMultipartFormData(
             return super().__getitem__(name)
         except KeyError:
             return schemas.unset
+    
 
     def __new__(
         cls,
@@ -72,7 +70,6 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -80,7 +77,6 @@ class SchemaForRequestBodyMultipartFormData(
             additionalMetadata=additionalMetadata,
             file=file,
             _configuration=_configuration,
-            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
-- 
GitLab


From 31625b7344becdb56852dcd9783d198bfc37c6db Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 11:20:30 -0700
Subject: [PATCH 08/30] Docs updated

---
 .../python-experimental/schema_doc.handlebars         | 10 +++++++++-
 .../python-experimental/docs/apis/tags/DefaultApi.md  |  1 +
 .../python-experimental/docs/apis/tags/FakeApi.md     | 11 ++++++++++-
 .../python-experimental/docs/apis/tags/PetApi.md      |  3 +++
 .../python-experimental/docs/apis/tags/StoreApi.md    |  2 +-
 .../docs/models/AdditionalPropertiesClass.md          |  1 +
 .../models/AdditionalPropertiesWithArrayOfEnums.md    |  2 +-
 .../python-experimental/docs/models/Address.md        |  2 +-
 .../python-experimental/docs/models/Animal.md         |  1 +
 .../python-experimental/docs/models/ApiResponse.md    |  1 +
 .../petstore/python-experimental/docs/models/Apple.md |  1 +
 .../python-experimental/docs/models/AppleReq.md       |  2 +-
 .../docs/models/ArrayOfArrayOfNumberOnly.md           |  1 +
 .../docs/models/ArrayOfNumberOnly.md                  |  1 +
 .../python-experimental/docs/models/ArrayTest.md      |  1 +
 .../python-experimental/docs/models/Banana.md         |  1 +
 .../python-experimental/docs/models/BananaReq.md      |  2 +-
 .../python-experimental/docs/models/BasquePig.md      |  1 +
 .../python-experimental/docs/models/Capitalization.md |  1 +
 .../python-experimental/docs/models/Category.md       |  1 +
 .../python-experimental/docs/models/ClassModel.md     |  1 +
 .../python-experimental/docs/models/Client.md         |  1 +
 .../python-experimental/docs/models/DanishPig.md      |  1 +
 .../python-experimental/docs/models/Drawing.md        |  2 +-
 .../python-experimental/docs/models/EnumArrays.md     |  1 +
 .../python-experimental/docs/models/EnumTest.md       |  1 +
 .../petstore/python-experimental/docs/models/File.md  |  1 +
 .../docs/models/FileSchemaTestClass.md                |  1 +
 .../petstore/python-experimental/docs/models/Foo.md   |  1 +
 .../python-experimental/docs/models/FormatTest.md     |  1 +
 .../petstore/python-experimental/docs/models/Fruit.md |  1 +
 .../python-experimental/docs/models/GmFruit.md        |  1 +
 .../docs/models/GrandparentAnimal.md                  |  1 +
 .../docs/models/HasOnlyReadOnly.md                    |  1 +
 .../docs/models/HealthCheckResult.md                  |  1 +
 .../python-experimental/docs/models/MapTest.md        |  1 +
 .../MixedPropertiesAndAdditionalPropertiesClass.md    |  1 +
 .../docs/models/Model200Response.md                   |  1 +
 .../python-experimental/docs/models/ModelReturn.md    |  1 +
 .../petstore/python-experimental/docs/models/Money.md |  1 +
 .../petstore/python-experimental/docs/models/Name.md  |  1 +
 .../docs/models/NoAdditionalProperties.md             |  2 +-
 .../python-experimental/docs/models/NullableClass.md  |  2 +-
 .../python-experimental/docs/models/NumberOnly.md     |  1 +
 .../docs/models/ObjectModelWithRefProps.md            |  1 +
 .../docs/models/ObjectWithDecimalProperties.md        |  1 +
 .../docs/models/ObjectWithDifficultlyNamedProps.md    |  1 +
 .../models/ObjectWithInlineCompositionProperty.md     |  1 +
 .../petstore/python-experimental/docs/models/Order.md |  1 +
 .../petstore/python-experimental/docs/models/Pet.md   |  1 +
 .../python-experimental/docs/models/Player.md         |  1 +
 .../docs/models/QuadrilateralInterface.md             |  1 +
 .../python-experimental/docs/models/ReadOnlyFirst.md  |  1 +
 .../docs/models/SpecialModelName.md                   |  1 +
 .../docs/models/StringBooleanMap.md                   |  2 +-
 .../petstore/python-experimental/docs/models/Tag.md   |  1 +
 .../docs/models/TriangleInterface.md                  |  1 +
 .../petstore/python-experimental/docs/models/User.md  |  1 +
 .../petstore/python-experimental/docs/models/Whale.md |  1 +
 .../petstore/python-experimental/docs/models/Zebra.md |  2 +-
 60 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/schema_doc.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/schema_doc.handlebars
index 6fb35e845a4..5df29019ce1 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schema_doc.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schema_doc.handlebars
@@ -16,7 +16,15 @@ Name | Type | Description | Notes
     {{/unless}}
     {{/each}}
     {{#with additionalProperties}}
-**any string name** | **{{dataType}}** | any string name can be used but the value must be the correct type | [optional]
+    {{#unless getIsBooleanSchemaFalse}}
+    {{#if getIsBooleanSchemaTrue}}
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
+    {{else}}
+**any string name** | {{#unless complexType}}**{{dataType}}**{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}}any string name can be used but the value must be the correct type | {{#unless required}}[optional] {{/unless}}{{#if isReadOnly}}[readonly] {{/if}}{{#if defaultValue}} if omitted the server will use the default value of {{{defaultValue}}}{{/if}}
+    {{/if}}
+    {{/unless}}
+    {{else}}
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
     {{/with}}
 {{else}}
 Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md
index 72b1215aaa9..99ba34ec28a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/DefaultApi.md
@@ -61,6 +61,7 @@ headers | Unset | headers were not defined |
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **string** | [**Foo**](Foo.md) |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 
 **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md
index 23bf896e008..7942df8c8fd 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/FakeApi.md
@@ -1019,6 +1019,7 @@ Name | Type | Description | Notes
 **dateTime** | **datetime** | None | [optional]  if omitted the server will use the default value of 2010-02-01T10:20:10.11111+01:00
 **password** | **str** | None | [optional] 
 **callback** | **str** | None | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -1128,6 +1129,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **enum_form_string_array** | **[str]** | Form parameter enum test (string array) | [optional] 
 **enum_form_string** | **str** | Form parameter enum test (string) | [optional]  if omitted the server will use the default value of "-efg"
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### query_params
 #### RequestQueryParams
@@ -1491,7 +1493,7 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **str** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **str** | any string name can be used but the value must be the correct type | [optional] 
 
 ### Return Types, Responses
 
@@ -1583,6 +1585,7 @@ typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, N
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### query_params
 #### RequestQueryParams
@@ -1605,6 +1608,7 @@ typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, N
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -1632,6 +1636,7 @@ typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, N
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -1697,6 +1702,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **param** | **str** | field1 | 
 **param2** | **str** | field2 | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -2035,6 +2041,7 @@ mapBean | MapBeanSchema | | optional
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **keyword** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -3032,6 +3039,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | **file_type** | file to upload | 
 **additionalMetadata** | **str** | Additional data to pass to server | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
@@ -3120,6 +3128,7 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **files** | **[file_type]** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### Return Types, Responses
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md
index aaf7662f456..f165afbe6fa 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/PetApi.md
@@ -1070,6 +1070,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** | Updated name of the pet | [optional] 
 **status** | **str** | Updated status of the pet | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### path_params
 #### RequestPathParams
@@ -1194,6 +1195,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **requiredFile** | **file_type** | file to upload | 
 **additionalMetadata** | **str** | Additional data to pass to server | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### path_params
 #### RequestPathParams
@@ -1324,6 +1326,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **additionalMetadata** | **str** | Additional data to pass to server | [optional] 
 **file** | **file_type** | file to upload | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 ### path_params
 #### RequestPathParams
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/StoreApi.md b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/StoreApi.md
index 4d8004a113b..c197a18a7a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/StoreApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/apis/tags/StoreApi.md
@@ -166,7 +166,7 @@ headers | Unset | headers were not defined |
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **int** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **int** | any string name can be used but the value must be the correct type | [optional] 
 
 
 **{str: (int,)}**
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md
index a1976eb18d8..938f852d4d6 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesClass.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **map_with_undeclared_properties_anytype_3** | **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | [optional] 
 **empty_map** | **{str: typing.Any}** | an object with no declared properties and no undeclared properties, hence it&#x27;s an empty map. | [optional] 
 **map_with_undeclared_properties_string** | **{str: (str,)}** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesWithArrayOfEnums.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesWithArrayOfEnums.md
index 1ea0e0b00bd..3fc1ac9fbdf 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesWithArrayOfEnums.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AdditionalPropertiesWithArrayOfEnums.md
@@ -3,7 +3,7 @@
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **[EnumClass]** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **[EnumClass]** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Address.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Address.md
index ed5ec353ecd..badfd3c3705 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Address.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Address.md
@@ -3,7 +3,7 @@
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **int** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **int** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md
index f9f309c5dd6..a12bd27f3ba 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Animal.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
 **color** | **str** |  | [optional]  if omitted the server will use the default value of "red"
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md
index 2b1bdb939b5..b22ca66e259 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ApiResponse.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **code** | **int** |  | [optional] 
 **type** | **str** |  | [optional] 
 **message** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md
index 58638f1d910..5b85514299e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Apple.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cultivar** | **str** |  | 
 **origin** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
index f34960428ce..0cf330faa83 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cultivar** | **str** |  | 
 **mealy** | **bool** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md
index 25953f6b1bf..745774d3dd4 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfArrayOfNumberOnly.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ArrayArrayNumber** | **[[int, float]]** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md
index 58174858bd3..1e0bf606163 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayOfNumberOnly.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **ArrayNumber** | **[int, float]** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md
index 8490ba34a9f..d12c6a2ebaa 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ArrayTest.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **array_of_string** | **[str]** |  | [optional] 
 **array_array_of_integer** | **[[int]]** |  | [optional] 
 **array_array_of_model** | **[[ReadOnlyFirst]]** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md
index be4f1e6383c..8a3ba11bf7b 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Banana.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **lengthCm** | **int, float** |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
index 93b3b9f0123..70837d41d42 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **lengthCm** | **int, float** |  | 
 **sweet** | **bool** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md b/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md
index c91310c1ebb..738b66e7061 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/BasquePig.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md
index b769e0ff179..97cb810c4a4 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Capitalization.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **Capital_Snake** | **str** |  | [optional] 
 **SCA_ETH_Flow_Points** | **str** |  | [optional] 
 **ATT_NAME** | **str** | Name of the pet  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md
index 13120c93bb7..fede7947978 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Category.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** |  |  if omitted the server will use the default value of "default-name"
 **id** | **int** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md
index ecdae32b428..c4dd643e932 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ClassModel.md
@@ -6,6 +6,7 @@ Model for testing model with \"_class\" property
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **_class** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md
index 29d16e55dfd..eb5f2cf0cea 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Client.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **client** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md b/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md
index 2d4a85fc658..b9511bc1c0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/DanishPig.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Drawing.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Drawing.md
index eb55a51020f..17309a02c80 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Drawing.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Drawing.md
@@ -7,7 +7,7 @@ Name | Type | Description | Notes
 **shapeOrNull** | [**ShapeOrNull**](ShapeOrNull.md) |  | [optional] 
 **nullableShape** | [**NullableShape**](NullableShape.md) |  | [optional] 
 **shapes** | **[Shape]** |  | [optional] 
-**any string name** | **Fruit** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | [**Fruit**](Fruit.md) | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md
index 7e22b7032e0..a1c65c2a11d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumArrays.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **just_symbol** | **str** |  | [optional] 
 **array_enum** | **[str]** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md
index 833a60e016c..10a029d4f9c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/EnumTest.md
@@ -12,6 +12,7 @@ Name | Type | Description | Notes
 **StringEnumWithDefaultValue** | [**StringEnumWithDefaultValue**](StringEnumWithDefaultValue.md) |  | [optional] 
 **IntegerEnumWithDefaultValue** | [**IntegerEnumWithDefaultValue**](IntegerEnumWithDefaultValue.md) |  | [optional] 
 **IntegerEnumOneValue** | [**IntegerEnumOneValue**](IntegerEnumOneValue.md) |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/File.md b/samples/openapi3/client/petstore/python-experimental/docs/models/File.md
index 3077ae9d9f1..097a045cc5e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/File.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/File.md
@@ -6,6 +6,7 @@ Must be named `File` for test.
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **sourceURI** | **str** | Test capitalization | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md
index 9494c5a020a..365acbe3760 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/FileSchemaTestClass.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **file** | [**File**](File.md) |  | [optional] 
 **files** | **[File]** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md
index 9d5e6c9f2a3..a7112c28962 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Foo.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional]  if omitted the server will use the default value of "bar"
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md
index 6116e1a5e4f..0f790bfc7f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/FormatTest.md
@@ -24,6 +24,7 @@ Name | Type | Description | Notes
 **pattern_with_digits** | **str** | A string that is a 10 digit number. Can have leading zeros. | [optional] 
 **pattern_with_digits_and_delimiter** | **str** | A string starting with &#x27;image_&#x27; (case insensitive) and one to three digits following i.e. Image_01. | [optional] 
 **noneProp** | **none_type** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md
index 82f2cb9f096..90c54688697 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Fruit.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **color** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md b/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md
index 1ad632ec0ab..55ce85a46bc 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/GmFruit.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **color** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md b/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md
index 698c8efdea7..612d8becc30 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/GrandparentAnimal.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **pet_type** | **str** |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md
index a7b7af3cfa2..ccce56daf26 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/HasOnlyReadOnly.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional] [readonly] 
 **foo** | **str** |  | [optional] [readonly] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md b/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md
index f049f0c4e9f..502688954aa 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/HealthCheckResult.md
@@ -6,6 +6,7 @@ Just a string to inform instance is up and running. Make it nullable in hope to
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **NullableMessage** | **str, none_type** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md b/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md
index ef1f3682cd1..16beabc74ad 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/MapTest.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 **map_of_enum_string** | **{str: (str,)}** |  | [optional] 
 **direct_map** | **{str: (bool,)}** |  | [optional] 
 **indirect_map** | [**StringBooleanMap**](StringBooleanMap.md) |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index c04421a6fb9..aad0cf7e64b 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **uuid** | **str** |  | [optional] 
 **dateTime** | **datetime** |  | [optional] 
 **map** | **{str: (Animal,)}** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md
index b8b38b7c65f..415ada0af11 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Model200Response.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **int** |  | [optional] 
 **class** | **str** | this is a reserved python keyword | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md
index 30575f76574..438525d796b 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ModelReturn.md
@@ -6,6 +6,7 @@ Model for testing reserved words
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **return** | **int** | this is a reserved python keyword | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md
index 5c7bd4efde2..7d45ccd17e1 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Money.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **amount** | **str** |  | 
 **currency** | [**Currency**](Currency.md) |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md
index 424366318d5..ac40314bc1b 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Name.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **name** | **int** |  | 
 **snake_case** | **int** |  | [optional] [readonly] 
 **property** | **str** | this is a reserved python keyword | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
index 682eeb27fe9..d22b796736f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **int** |  | 
 **petId** | **int** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/NullableClass.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NullableClass.md
index 6e603095aa3..ce345d5536e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NullableClass.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NullableClass.md
@@ -15,7 +15,7 @@ Name | Type | Description | Notes
 **object_nullable_prop** | **{str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},)}, none_type** |  | [optional] 
 **object_and_items_nullable_prop** | **{str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)}, none_type)}, none_type** |  | [optional] 
 **object_items_nullable** | **{str: ({str: (bool, date, datetime, dict, float, int, list, str, none_type)}, none_type)}** |  | [optional] 
-**any string name** | **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}, none_type** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md
index a901bfeb0fd..05bc4185c8d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NumberOnly.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustNumber** | **int, float** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md
index 3f6cca02481..246c8374ac4 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectModelWithRefProps.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **myNumber** | [**NumberWithValidations**](NumberWithValidations.md) |  | [optional] 
 **myString** | **str** |  | [optional] 
 **myBoolean** | **bool** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md
index 4f35ddc82e2..1986343d3ed 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDecimalProperties.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **length** | **str** |  | [optional] 
 **width** | **str** |  | [optional] 
 **cost** | [**Money**](Money.md) |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md
index a0d330931be..d8301cc9cfb 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithDifficultlyNamedProps.md
@@ -8,6 +8,7 @@ Name | Type | Description | Notes
 **123-list** | **str** |  | 
 **$special[property.name]** | **int** |  | [optional] 
 **123Number** | **int** |  | [optional] [readonly] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md
index a7e3d603daa..ed9bcb7f40e 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ObjectWithInlineCompositionProperty.md
@@ -4,6 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **someProp** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md
index 2126f211eee..06edf39531c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Order.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **shipDate** | **datetime** |  | [optional] 
 **status** | **str** | Order Status | [optional] 
 **complete** | **bool** |  | [optional]  if omitted the server will use the default value of False
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md
index 08c682639df..0a194ddef4b 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Pet.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **category** | [**Category**](Category.md) |  | [optional] 
 **tags** | **[Tag]** |  | [optional] 
 **status** | **str** | pet status in the store | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md
index a63109fab7e..bcd2aa8890f 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Player.md
@@ -7,6 +7,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **str** |  | [optional] 
 **enemyPlayer** | [**Player**](Player.md) |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md b/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md
index c6db5a24949..2d050c4d33d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/QuadrilateralInterface.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **shapeType** | **str** |  | 
 **quadrilateralType** | **str** |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md b/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md
index 65c4bfebf9e..8875616fa12 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/ReadOnlyFirst.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional] [readonly] 
 **baz** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md b/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md
index 6449724f69a..2f836a7ca7a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/SpecialModelName.md
@@ -6,6 +6,7 @@ model with an invalid class name for python
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **a** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/StringBooleanMap.md b/samples/openapi3/client/petstore/python-experimental/docs/models/StringBooleanMap.md
index 488f7387eb1..175455f31c1 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/StringBooleanMap.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/StringBooleanMap.md
@@ -3,7 +3,7 @@
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md
index 477b894e242..6aea7dc5b1a 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Tag.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **int** |  | [optional] 
 **name** | **str** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md b/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md
index 168c654417f..87b482fb6e3 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/TriangleInterface.md
@@ -5,6 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **shapeType** | **str** |  | 
 **triangleType** | **str** |  | 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/User.md b/samples/openapi3/client/petstore/python-experimental/docs/models/User.md
index 449ffd004ea..2f40d1c8e67 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/User.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/User.md
@@ -16,6 +16,7 @@ Name | Type | Description | Notes
 **anyTypeProp** | **bool, date, datetime, dict, float, int, list, str, none_type** | test code generation for any type Here the &#x27;type&#x27; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389 | [optional] 
 **anyTypeExceptNullProp** | **bool, date, datetime, dict, float, int, list, str, none_type** | any type except &#x27;null&#x27; Here the &#x27;type&#x27; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. | [optional] 
 **anyTypePropNullable** | **bool, date, datetime, dict, float, int, list, str, none_type** | test code generation for any type Here the &#x27;type&#x27; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#x27;nullable&#x27; attribute does not change the allowed values. | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md
index 3af76af8382..8bfa4cf41cc 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Whale.md
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
 **className** | **str** |  | 
 **hasBaleen** | **bool** |  | [optional] 
 **hasTeeth** | **bool** |  | [optional] 
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/Zebra.md b/samples/openapi3/client/petstore/python-experimental/docs/models/Zebra.md
index 49d9f67926f..d1f99b76f00 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/Zebra.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/Zebra.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **className** | **str** |  | 
 **type** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
-- 
GitLab


From fde1c0e704edc71edab48fdc9a2322687d47d423 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 11:30:32 -0700
Subject: [PATCH 09/30] Do not write additionalProperties when they are unset

---
 .../model_templates/dict_partial.handlebars              | 3 ---
 .../model_templates/schema.handlebars                    | 2 +-
 .../petstore_api/model/additional_properties_class.py    | 4 ----
 .../petstore_api/model/additional_properties_class.pyi   | 4 ----
 .../python-experimental/petstore_api/model/animal.py     | 1 -
 .../python-experimental/petstore_api/model/animal.pyi    | 1 -
 .../petstore_api/model/any_type_not_string.py            | 1 -
 .../petstore_api/model/any_type_not_string.pyi           | 1 -
 .../petstore_api/model/api_response.py                   | 1 -
 .../petstore_api/model/api_response.pyi                  | 1 -
 .../python-experimental/petstore_api/model/apple.py      | 1 -
 .../python-experimental/petstore_api/model/apple.pyi     | 1 -
 .../python-experimental/petstore_api/model/apple_req.py  | 1 -
 .../python-experimental/petstore_api/model/apple_req.pyi | 1 -
 .../petstore_api/model/array_of_array_of_number_only.py  | 1 -
 .../petstore_api/model/array_of_array_of_number_only.pyi | 1 -
 .../petstore_api/model/array_of_number_only.py           | 1 -
 .../petstore_api/model/array_of_number_only.pyi          | 1 -
 .../python-experimental/petstore_api/model/array_test.py | 1 -
 .../petstore_api/model/array_test.pyi                    | 1 -
 .../python-experimental/petstore_api/model/banana.py     | 1 -
 .../python-experimental/petstore_api/model/banana.pyi    | 1 -
 .../python-experimental/petstore_api/model/banana_req.py | 1 -
 .../petstore_api/model/banana_req.pyi                    | 1 -
 .../python-experimental/petstore_api/model/basque_pig.py | 1 -
 .../petstore_api/model/basque_pig.pyi                    | 1 -
 .../petstore_api/model/capitalization.py                 | 1 -
 .../petstore_api/model/capitalization.pyi                | 1 -
 .../python-experimental/petstore_api/model/cat.py        | 2 --
 .../python-experimental/petstore_api/model/cat.pyi       | 2 --
 .../python-experimental/petstore_api/model/category.py   | 1 -
 .../python-experimental/petstore_api/model/category.pyi  | 1 -
 .../python-experimental/petstore_api/model/child_cat.py  | 2 --
 .../python-experimental/petstore_api/model/child_cat.pyi | 2 --
 .../petstore_api/model/class_model.py                    | 1 -
 .../petstore_api/model/class_model.pyi                   | 1 -
 .../python-experimental/petstore_api/model/client.py     | 1 -
 .../python-experimental/petstore_api/model/client.pyi    | 1 -
 .../petstore_api/model/complex_quadrilateral.py          | 2 --
 .../petstore_api/model/complex_quadrilateral.pyi         | 2 --
 .../composed_any_of_different_types_no_validations.py    | 3 ---
 .../composed_any_of_different_types_no_validations.pyi   | 3 ---
 .../petstore_api/model/composed_object.py                | 1 -
 .../petstore_api/model/composed_object.pyi               | 1 -
 .../model/composed_one_of_different_types.py             | 2 --
 .../model/composed_one_of_different_types.pyi            | 2 --
 .../python-experimental/petstore_api/model/danish_pig.py | 1 -
 .../petstore_api/model/danish_pig.pyi                    | 1 -
 .../python-experimental/petstore_api/model/dog.py        | 2 --
 .../python-experimental/petstore_api/model/dog.pyi       | 2 --
 .../petstore_api/model/enum_arrays.py                    | 1 -
 .../petstore_api/model/enum_arrays.pyi                   | 1 -
 .../python-experimental/petstore_api/model/enum_test.py  | 1 -
 .../python-experimental/petstore_api/model/enum_test.pyi | 1 -
 .../petstore_api/model/equilateral_triangle.py           | 2 --
 .../petstore_api/model/equilateral_triangle.pyi          | 2 --
 .../python-experimental/petstore_api/model/file.py       | 1 -
 .../python-experimental/petstore_api/model/file.pyi      | 1 -
 .../petstore_api/model/file_schema_test_class.py         | 1 -
 .../petstore_api/model/file_schema_test_class.pyi        | 1 -
 .../python-experimental/petstore_api/model/foo.py        | 1 -
 .../python-experimental/petstore_api/model/foo.pyi       | 1 -
 .../petstore_api/model/format_test.py                    | 1 -
 .../petstore_api/model/format_test.pyi                   | 1 -
 .../python-experimental/petstore_api/model/fruit.py      | 1 -
 .../python-experimental/petstore_api/model/fruit.pyi     | 1 -
 .../python-experimental/petstore_api/model/fruit_req.py  | 1 -
 .../python-experimental/petstore_api/model/fruit_req.pyi | 1 -
 .../python-experimental/petstore_api/model/gm_fruit.py   | 1 -
 .../python-experimental/petstore_api/model/gm_fruit.pyi  | 1 -
 .../petstore_api/model/grandparent_animal.py             | 1 -
 .../petstore_api/model/grandparent_animal.pyi            | 1 -
 .../petstore_api/model/has_only_read_only.py             | 1 -
 .../petstore_api/model/has_only_read_only.pyi            | 1 -
 .../petstore_api/model/health_check_result.py            | 1 -
 .../petstore_api/model/health_check_result.pyi           | 1 -
 .../petstore_api/model/isosceles_triangle.py             | 2 --
 .../petstore_api/model/isosceles_triangle.pyi            | 2 --
 .../python-experimental/petstore_api/model/mammal.py     | 1 -
 .../python-experimental/petstore_api/model/mammal.pyi    | 1 -
 .../python-experimental/petstore_api/model/map_test.py   | 1 -
 .../python-experimental/petstore_api/model/map_test.pyi  | 1 -
 .../mixed_properties_and_additional_properties_class.py  | 1 -
 .../mixed_properties_and_additional_properties_class.pyi | 1 -
 .../petstore_api/model/model200_response.py              | 1 -
 .../petstore_api/model/model200_response.pyi             | 1 -
 .../petstore_api/model/model_return.py                   | 1 -
 .../petstore_api/model/model_return.pyi                  | 1 -
 .../python-experimental/petstore_api/model/money.py      | 1 -
 .../python-experimental/petstore_api/model/money.pyi     | 1 -
 .../python-experimental/petstore_api/model/name.py       | 1 -
 .../python-experimental/petstore_api/model/name.pyi      | 1 -
 .../petstore_api/model/no_additional_properties.py       | 1 -
 .../petstore_api/model/no_additional_properties.pyi      | 1 -
 .../petstore_api/model/nullable_class.py                 | 7 -------
 .../petstore_api/model/nullable_class.pyi                | 7 -------
 .../petstore_api/model/nullable_shape.py                 | 1 -
 .../petstore_api/model/nullable_shape.pyi                | 1 -
 .../petstore_api/model/number_only.py                    | 1 -
 .../petstore_api/model/number_only.pyi                   | 1 -
 .../petstore_api/model/object_interface.py               | 1 -
 .../petstore_api/model/object_interface.pyi              | 1 -
 .../petstore_api/model/object_model_with_ref_props.py    | 1 -
 .../petstore_api/model/object_model_with_ref_props.pyi   | 1 -
 .../petstore_api/model/object_with_decimal_properties.py | 1 -
 .../model/object_with_decimal_properties.pyi             | 1 -
 .../model/object_with_difficultly_named_props.py         | 1 -
 .../model/object_with_difficultly_named_props.pyi        | 1 -
 .../model/object_with_inline_composition_property.py     | 2 --
 .../model/object_with_inline_composition_property.pyi    | 2 --
 .../petstore_api/model/object_with_validations.py        | 1 -
 .../petstore_api/model/object_with_validations.pyi       | 1 -
 .../python-experimental/petstore_api/model/order.py      | 1 -
 .../python-experimental/petstore_api/model/order.pyi     | 1 -
 .../python-experimental/petstore_api/model/parent_pet.py | 1 -
 .../petstore_api/model/parent_pet.pyi                    | 1 -
 .../python-experimental/petstore_api/model/pet.py        | 1 -
 .../python-experimental/petstore_api/model/pet.pyi       | 1 -
 .../python-experimental/petstore_api/model/pig.py        | 1 -
 .../python-experimental/petstore_api/model/pig.pyi       | 1 -
 .../python-experimental/petstore_api/model/player.py     | 1 -
 .../python-experimental/petstore_api/model/player.pyi    | 1 -
 .../petstore_api/model/quadrilateral.py                  | 1 -
 .../petstore_api/model/quadrilateral.pyi                 | 1 -
 .../petstore_api/model/quadrilateral_interface.py        | 1 -
 .../petstore_api/model/quadrilateral_interface.pyi       | 1 -
 .../petstore_api/model/read_only_first.py                | 1 -
 .../petstore_api/model/read_only_first.pyi               | 1 -
 .../petstore_api/model/scalene_triangle.py               | 2 --
 .../petstore_api/model/scalene_triangle.pyi              | 2 --
 .../python-experimental/petstore_api/model/shape.py      | 1 -
 .../python-experimental/petstore_api/model/shape.pyi     | 1 -
 .../petstore_api/model/shape_or_null.py                  | 1 -
 .../petstore_api/model/shape_or_null.pyi                 | 1 -
 .../petstore_api/model/simple_quadrilateral.py           | 2 --
 .../petstore_api/model/simple_quadrilateral.pyi          | 2 --
 .../petstore_api/model/some_object.py                    | 1 -
 .../petstore_api/model/some_object.pyi                   | 1 -
 .../petstore_api/model/special_model_name.py             | 1 -
 .../petstore_api/model/special_model_name.pyi            | 1 -
 .../python-experimental/petstore_api/model/tag.py        | 1 -
 .../python-experimental/petstore_api/model/tag.pyi       | 1 -
 .../python-experimental/petstore_api/model/triangle.py   | 1 -
 .../python-experimental/petstore_api/model/triangle.pyi  | 1 -
 .../petstore_api/model/triangle_interface.py             | 1 -
 .../petstore_api/model/triangle_interface.pyi            | 1 -
 .../python-experimental/petstore_api/model/user.py       | 4 ----
 .../python-experimental/petstore_api/model/user.pyi      | 4 ----
 .../python-experimental/petstore_api/model/whale.py      | 1 -
 .../python-experimental/petstore_api/model/whale.pyi     | 1 -
 .../petstore_api/paths/fake_1/post.py                    | 1 -
 .../petstore_api/paths/fake_1/post.pyi                   | 1 -
 .../python-experimental/petstore_api/paths/fake_2/get.py | 1 -
 .../petstore_api/paths/fake_2/get.pyi                    | 1 -
 .../petstore_api/paths/fake_inline_composition_/post.py  | 9 ---------
 .../petstore_api/paths/fake_inline_composition_/post.pyi | 9 ---------
 .../petstore_api/paths/fake_json_form_data/get.py        | 1 -
 .../petstore_api/paths/fake_json_form_data/get.pyi       | 1 -
 .../petstore_api/paths/fake_obj_in_query/get.py          | 1 -
 .../petstore_api/paths/fake_obj_in_query/get.pyi         | 1 -
 .../fake_pet_id_upload_image_with_required_file/post.py  | 1 -
 .../fake_pet_id_upload_image_with_required_file/post.pyi | 1 -
 .../petstore_api/paths/fake_upload_file/post.py          | 1 -
 .../petstore_api/paths/fake_upload_file/post.pyi         | 1 -
 .../petstore_api/paths/fake_upload_files/post.py         | 1 -
 .../petstore_api/paths/fake_upload_files/post.pyi        | 1 -
 .../python-experimental/petstore_api/paths/foo/get.py    | 1 -
 .../python-experimental/petstore_api/paths/foo/get.pyi   | 1 -
 .../petstore_api/paths/pet_pet_id_3/post.py              | 1 -
 .../petstore_api/paths/pet_pet_id_3/post.pyi             | 1 -
 .../petstore_api/paths/pet_pet_id_upload_image/post.py   | 1 -
 .../petstore_api/paths/pet_pet_id_upload_image/post.pyi  | 1 -
 172 files changed, 1 insertion(+), 238 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
index 7e8b8795594..956af82d2fd 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/dict_partial.handlebars
@@ -58,6 +58,3 @@ def {{baseName}}(cls) -> typing.Type['{{complexType}}']:
 {{> model_templates/schema }}
 {{/if}}
 {{/with}}
-{{#unless additionalProperties}}
-additional_properties = None
-{{/unless}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
index 41c7346762b..5df38ac7628 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
@@ -7,7 +7,7 @@
     {{else}}
         {{#or isMap isArray isAnyType}}
             {{#if isMap}}
-                {{#or hasVars hasValidation getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping}}
+                {{#or hasVars hasValidation getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping }}
 {{> model_templates/schema_dict }}
                 {{else}}
                     {{#if additionalPropertiesIsAnyType}}
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 2370938fa7e..9a6f18623f3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -135,7 +135,6 @@ class AdditionalPropertiesClass(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
                 def __new__(
                     cls,
@@ -155,7 +154,6 @@ class AdditionalPropertiesClass(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
                 def __new__(
                     cls,
@@ -214,7 +212,6 @@ class AdditionalPropertiesClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                             not_schema = schemas.AnyTypeSchema
                     
                     
@@ -291,7 +288,6 @@ class AdditionalPropertiesClass(
                 "empty_map": empty_map,
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
-        additional_properties = None
     
     map_property: typing.Union[MetaOapg.properties.map_property, schemas.Unset]
     map_of_map_property: typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 2370938fa7e..9a6f18623f3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -135,7 +135,6 @@ class AdditionalPropertiesClass(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
                 def __new__(
                     cls,
@@ -155,7 +154,6 @@ class AdditionalPropertiesClass(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
                 def __new__(
                     cls,
@@ -214,7 +212,6 @@ class AdditionalPropertiesClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                             not_schema = schemas.AnyTypeSchema
                     
                     
@@ -291,7 +288,6 @@ class AdditionalPropertiesClass(
                 "empty_map": empty_map,
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
-        additional_properties = None
     
     map_property: typing.Union[MetaOapg.properties.map_property, schemas.Unset]
     map_of_map_property: typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 41dc7d3d1bf..375a1cbb232 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -53,7 +53,6 @@ class Animal(
                 "className": className,
                 "color": color,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     color: typing.Union[MetaOapg.properties.color, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 41dc7d3d1bf..375a1cbb232 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -53,7 +53,6 @@ class Animal(
                 "className": className,
                 "color": color,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     color: typing.Union[MetaOapg.properties.color, schemas.Unset]
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 5507431c5a0..91e9ce6b088 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
@@ -33,7 +33,6 @@ class AnyTypeNotString(
 
 
     class MetaOapg:
-        additional_properties = None
         not_schema = schemas.StrSchema
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
index 5507431c5a0..91e9ce6b088 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
@@ -33,7 +33,6 @@ class AnyTypeNotString(
 
 
     class MetaOapg:
-        additional_properties = None
         not_schema = schemas.StrSchema
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 2eaaf5a2fdc..92dc5ee9c36 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -42,7 +42,6 @@ class ApiResponse(
                 "type": type,
                 "message": message,
             }
-        additional_properties = None
     
     code: typing.Union[MetaOapg.properties.code, schemas.Unset]
     type: typing.Union[MetaOapg.properties.type, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 2eaaf5a2fdc..92dc5ee9c36 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -42,7 +42,6 @@ class ApiResponse(
                 "type": type,
                 "message": message,
             }
-        additional_properties = None
     
     code: typing.Union[MetaOapg.properties.code, schemas.Unset]
     type: typing.Union[MetaOapg.properties.type, schemas.Unset]
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 b8f8b1df0c7..c0c10005247 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
@@ -70,7 +70,6 @@ class Apple(
                 "cultivar": cultivar,
                 "origin": origin,
             }
-        additional_properties = None
 
     
     cultivar: MetaOapg.properties.cultivar
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index d2f5cc89e5d..1e67eb867b9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -57,7 +57,6 @@ class Apple(
                 "cultivar": cultivar,
                 "origin": origin,
             }
-        additional_properties = None
 
     
     cultivar: MetaOapg.properties.cultivar
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index df24a42e601..58c4c97372c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -51,7 +51,6 @@ class AppleReq(
         
         
             class MetaOapg:
-                additional_properties = None
                 not_schema = schemas.AnyTypeSchema
         
         
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index df24a42e601..58c4c97372c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -51,7 +51,6 @@ class AppleReq(
         
         
             class MetaOapg:
-                additional_properties = None
                 not_schema = schemas.AnyTypeSchema
         
         
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 c69a42a0995..1c113b57b6a 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
@@ -82,7 +82,6 @@ class ArrayOfArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
-        additional_properties = None
     
     ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index c69a42a0995..1c113b57b6a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -82,7 +82,6 @@ class ArrayOfArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
-        additional_properties = None
     
     ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]
     
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 1d900261a25..fd168beceea 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
@@ -60,7 +60,6 @@ class ArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayNumber": ArrayNumber,
             }
-        additional_properties = None
     
     ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 1d900261a25..fd168beceea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -60,7 +60,6 @@ class ArrayOfNumberOnly(
             __annotations__ = {
                 "ArrayNumber": ArrayNumber,
             }
-        additional_properties = None
     
     ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]
     
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 ddf7b6b7400..cf34969ca8d 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
@@ -156,7 +156,6 @@ class ArrayTest(
                 "array_array_of_integer": array_array_of_integer,
                 "array_array_of_model": array_array_of_model,
             }
-        additional_properties = None
     
     array_of_string: typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]
     array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index ddf7b6b7400..cf34969ca8d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -156,7 +156,6 @@ class ArrayTest(
                 "array_array_of_integer": array_array_of_integer,
                 "array_array_of_model": array_array_of_model,
             }
-        additional_properties = None
     
     array_of_string: typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]
     array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index e87331adc83..36e1b68bc76 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -41,7 +41,6 @@ class Banana(
             __annotations__ = {
                 "lengthCm": lengthCm,
             }
-        additional_properties = None
     
     lengthCm: MetaOapg.properties.lengthCm
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index e87331adc83..36e1b68bc76 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -41,7 +41,6 @@ class Banana(
             __annotations__ = {
                 "lengthCm": lengthCm,
             }
-        additional_properties = None
     
     lengthCm: MetaOapg.properties.lengthCm
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index b66ae4dc97a..77458087c1d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -51,7 +51,6 @@ class BananaReq(
         
         
             class MetaOapg:
-                additional_properties = None
                 not_schema = schemas.AnyTypeSchema
         
         
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index b66ae4dc97a..77458087c1d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -51,7 +51,6 @@ class BananaReq(
         
         
             class MetaOapg:
-                additional_properties = None
                 not_schema = schemas.AnyTypeSchema
         
         
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index f40d4d7ba22..b7d968ebbfa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -55,7 +55,6 @@ class BasquePig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index f40d4d7ba22..b7d968ebbfa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -55,7 +55,6 @@ class BasquePig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index e95c90d1b8d..618ea4052ca 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -48,7 +48,6 @@ class Capitalization(
                 "SCA_ETH_Flow_Points": SCA_ETH_Flow_Points,
                 "ATT_NAME": ATT_NAME,
             }
-        additional_properties = None
     
     smallCamel: typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]
     CapitalCamel: typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index e95c90d1b8d..618ea4052ca 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -48,7 +48,6 @@ class Capitalization(
                 "SCA_ETH_Flow_Points": SCA_ETH_Flow_Points,
                 "ATT_NAME": ATT_NAME,
             }
-        additional_properties = None
     
     smallCamel: typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]
     CapitalCamel: typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]
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 232870f50f6..8c6a623144d 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
@@ -33,7 +33,6 @@ class Cat(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -47,7 +46,6 @@ class Cat(
                     __annotations__ = {
                         "declawed": declawed,
                     }
-                additional_properties = None
             
             declawed: typing.Union[MetaOapg.properties.declawed, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index 232870f50f6..8c6a623144d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -33,7 +33,6 @@ class Cat(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -47,7 +46,6 @@ class Cat(
                     __annotations__ = {
                         "declawed": declawed,
                     }
-                additional_properties = None
             
             declawed: typing.Union[MetaOapg.properties.declawed, schemas.Unset]
             
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 08599819136..b1d72c93b6b 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,7 +43,6 @@ class Category(
                 "name": name,
                 "id": id,
             }
-        additional_properties = None
     
     name: MetaOapg.properties.name
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index 08599819136..b1d72c93b6b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -43,7 +43,6 @@ class Category(
                 "name": name,
                 "id": id,
             }
-        additional_properties = None
     
     name: MetaOapg.properties.name
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
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 91ec8188912..1ee8d9db1f1 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
@@ -33,7 +33,6 @@ class ChildCat(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -47,7 +46,6 @@ class ChildCat(
                     __annotations__ = {
                         "name": name,
                     }
-                additional_properties = None
             
             name: typing.Union[MetaOapg.properties.name, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 91ec8188912..1ee8d9db1f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -33,7 +33,6 @@ class ChildCat(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -47,7 +46,6 @@ class ChildCat(
                     __annotations__ = {
                         "name": name,
                     }
-                additional_properties = None
             
             name: typing.Union[MetaOapg.properties.name, schemas.Unset]
             
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 f80b7c1f315..c6676720d37 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,7 +40,6 @@ class ClassModel(
             __annotations__ = {
                 "_class": _class,
             }
-        additional_properties = None
 
     
     _class: typing.Union[MetaOapg.properties._class, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index f80b7c1f315..c6676720d37 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -40,7 +40,6 @@ class ClassModel(
             __annotations__ = {
                 "_class": _class,
             }
-        additional_properties = None
 
     
     _class: typing.Union[MetaOapg.properties._class, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 86b26354c84..85b99215a99 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -38,7 +38,6 @@ class Client(
             __annotations__ = {
                 "client": client,
             }
-        additional_properties = None
     
     client: typing.Union[MetaOapg.properties.client, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 86b26354c84..85b99215a99 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -38,7 +38,6 @@ class Client(
             __annotations__ = {
                 "client": client,
             }
-        additional_properties = None
     
     client: typing.Union[MetaOapg.properties.client, schemas.Unset]
     
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 9fda3e0a9d0..7c612c131a6 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
@@ -33,7 +33,6 @@ class ComplexQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class ComplexQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 9fda3e0a9d0..7c612c131a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -33,7 +33,6 @@ class ComplexQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class ComplexQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
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 c6cc1812d24..ba673b27114 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
@@ -33,7 +33,6 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class any_of_0(
@@ -42,7 +41,6 @@ class ComposedAnyOfDifferentTypesNoValidations(
         
         
             class MetaOapg:
-                additional_properties = None
         
             def __new__(
                 cls,
@@ -67,7 +65,6 @@ class ComposedAnyOfDifferentTypesNoValidations(
         
         
             class MetaOapg:
-                additional_properties = None
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
index c6cc1812d24..ba673b27114 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
@@ -33,7 +33,6 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class any_of_0(
@@ -42,7 +41,6 @@ class ComposedAnyOfDifferentTypesNoValidations(
         
         
             class MetaOapg:
-                additional_properties = None
         
             def __new__(
                 cls,
@@ -67,7 +65,6 @@ class ComposedAnyOfDifferentTypesNoValidations(
         
         
             class MetaOapg:
-                additional_properties = None
         
             def __new__(
                 cls,
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 f761b09f13f..fd2246a6287 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
@@ -34,7 +34,6 @@ class ComposedObject(
 
 
     class MetaOapg:
-        additional_properties = None
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
index f761b09f13f..fd2246a6287 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
@@ -34,7 +34,6 @@ class ComposedObject(
 
 
     class MetaOapg:
-        additional_properties = None
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
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 f9a23957f7f..f0e4c3bfd24 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
@@ -35,7 +35,6 @@ class ComposedOneOfDifferentTypes(
 
 
     class MetaOapg:
-        additional_properties = None
         one_of_2 = schemas.NoneSchema
         one_of_3 = schemas.DateSchema
         
@@ -46,7 +45,6 @@ class ComposedOneOfDifferentTypes(
         
         
             class MetaOapg:
-                additional_properties = None
                 max_properties = 4
                 min_properties = 4
         
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
index 1a375b3b80a..615d7608bdb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
@@ -35,7 +35,6 @@ class ComposedOneOfDifferentTypes(
 
 
     class MetaOapg:
-        additional_properties = None
         one_of_2 = schemas.NoneSchema
         one_of_3 = schemas.DateSchema
         
@@ -46,7 +45,6 @@ class ComposedOneOfDifferentTypes(
         
         
             class MetaOapg:
-                additional_properties = None
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index c4360f71f23..56b7e253d64 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -55,7 +55,6 @@ class DanishPig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index c4360f71f23..56b7e253d64 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -55,7 +55,6 @@ class DanishPig(
             __annotations__ = {
                 "className": className,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     
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 2395abfa9d4..6ff8aa26911 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
@@ -33,7 +33,6 @@ class Dog(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -47,7 +46,6 @@ class Dog(
                     __annotations__ = {
                         "breed": breed,
                     }
-                additional_properties = None
             
             breed: typing.Union[MetaOapg.properties.breed, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 2395abfa9d4..6ff8aa26911 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -33,7 +33,6 @@ class Dog(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -47,7 +46,6 @@ class Dog(
                     __annotations__ = {
                         "breed": breed,
                     }
-                additional_properties = None
             
             breed: typing.Union[MetaOapg.properties.breed, schemas.Unset]
             
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 6d040985f18..89cda8ad599 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
@@ -102,7 +102,6 @@ class EnumArrays(
                 "just_symbol": just_symbol,
                 "array_enum": array_enum,
             }
-        additional_properties = None
     
     just_symbol: typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]
     array_enum: typing.Union[MetaOapg.properties.array_enum, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 6d040985f18..89cda8ad599 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -102,7 +102,6 @@ class EnumArrays(
                 "just_symbol": just_symbol,
                 "array_enum": array_enum,
             }
-        additional_properties = None
     
     just_symbol: typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]
     array_enum: typing.Union[MetaOapg.properties.array_enum, schemas.Unset]
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 7335cf9c067..1a6ff6bed51 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
@@ -169,7 +169,6 @@ class EnumTest(
                 "IntegerEnumWithDefaultValue": IntegerEnumWithDefaultValue,
                 "IntegerEnumOneValue": IntegerEnumOneValue,
             }
-        additional_properties = None
     
     enum_string_required: MetaOapg.properties.enum_string_required
     enum_string: typing.Union[MetaOapg.properties.enum_string, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index 7335cf9c067..1a6ff6bed51 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -169,7 +169,6 @@ class EnumTest(
                 "IntegerEnumWithDefaultValue": IntegerEnumWithDefaultValue,
                 "IntegerEnumOneValue": IntegerEnumOneValue,
             }
-        additional_properties = None
     
     enum_string_required: MetaOapg.properties.enum_string_required
     enum_string: typing.Union[MetaOapg.properties.enum_string, schemas.Unset]
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 75c121b5a17..f33b43d2735 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
@@ -33,7 +33,6 @@ class EquilateralTriangle(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class EquilateralTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index 75c121b5a17..f33b43d2735 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -33,7 +33,6 @@ class EquilateralTriangle(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class EquilateralTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 22ae4e9ba55..9bd2581b465 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -40,7 +40,6 @@ class File(
             __annotations__ = {
                 "sourceURI": sourceURI,
             }
-        additional_properties = None
     
     sourceURI: typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 22ae4e9ba55..9bd2581b465 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -40,7 +40,6 @@ class File(
             __annotations__ = {
                 "sourceURI": sourceURI,
             }
-        additional_properties = None
     
     sourceURI: typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]
     
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 62bfdfe50a9..95c17c0dcfb 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
@@ -70,7 +70,6 @@ class FileSchemaTestClass(
                 "file": file,
                 "files": files,
             }
-        additional_properties = None
     
     file: typing.Union['File', schemas.Unset]
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 62bfdfe50a9..95c17c0dcfb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -70,7 +70,6 @@ class FileSchemaTestClass(
                 "file": file,
                 "files": files,
             }
-        additional_properties = None
     
     file: typing.Union['File', schemas.Unset]
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index 2830b96bc11..66383419f6e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -38,7 +38,6 @@ class Foo(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index 2830b96bc11..66383419f6e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -38,7 +38,6 @@ class Foo(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
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 e38ef565964..905f7ce6d40 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
@@ -199,7 +199,6 @@ class FormatTest(
                 "pattern_with_digits_and_delimiter": pattern_with_digits_and_delimiter,
                 "noneProp": noneProp,
             }
-        additional_properties = None
     
     date: MetaOapg.properties.date
     number: MetaOapg.properties.number
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index 7096edc96a5..aef40a2ce49 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -151,7 +151,6 @@ class FormatTest(
                 "pattern_with_digits_and_delimiter": pattern_with_digits_and_delimiter,
                 "noneProp": noneProp,
             }
-        additional_properties = None
     
     date: MetaOapg.properties.date
     number: MetaOapg.properties.number
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 448abb55e21..6e1a5596680 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
@@ -38,7 +38,6 @@ class Fruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 448abb55e21..6e1a5596680 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -38,7 +38,6 @@ class Fruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = None
         
         @classmethod
         @property
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 237b8462c07..097520f6d1e 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
@@ -33,7 +33,6 @@ class FruitReq(
 
 
     class MetaOapg:
-        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
index 237b8462c07..097520f6d1e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
@@ -33,7 +33,6 @@ class FruitReq(
 
 
     class MetaOapg:
-        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
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 86f788e6ff7..0ba9510a961 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
@@ -38,7 +38,6 @@ class GmFruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 86f788e6ff7..0ba9510a961 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -38,7 +38,6 @@ class GmFruit(
             __annotations__ = {
                 "color": color,
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index cbfd86dc28a..92d4f58c0d6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -51,7 +51,6 @@ class GrandparentAnimal(
             __annotations__ = {
                 "pet_type": pet_type,
             }
-        additional_properties = None
     
     pet_type: MetaOapg.properties.pet_type
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index cbfd86dc28a..92d4f58c0d6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -51,7 +51,6 @@ class GrandparentAnimal(
             __annotations__ = {
                 "pet_type": pet_type,
             }
-        additional_properties = None
     
     pet_type: MetaOapg.properties.pet_type
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index 71b101c5fa7..c0ca68523d1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -40,7 +40,6 @@ class HasOnlyReadOnly(
                 "bar": bar,
                 "foo": foo,
             }
-        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index 71b101c5fa7..c0ca68523d1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -40,7 +40,6 @@ class HasOnlyReadOnly(
                 "bar": bar,
                 "foo": foo,
             }
-        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
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 1be64b66a09..20d4c61d0c3 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
@@ -60,7 +60,6 @@ class HealthCheckResult(
             __annotations__ = {
                 "NullableMessage": NullableMessage,
             }
-        additional_properties = None
     
     NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 1be64b66a09..20d4c61d0c3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -60,7 +60,6 @@ class HealthCheckResult(
             __annotations__ = {
                 "NullableMessage": NullableMessage,
             }
-        additional_properties = None
     
     NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]
     
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 3d1ef3f636c..ceaa43a27c1 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
@@ -33,7 +33,6 @@ class IsoscelesTriangle(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class IsoscelesTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index 3d1ef3f636c..ceaa43a27c1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -33,7 +33,6 @@ class IsoscelesTriangle(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class IsoscelesTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
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 bcf9561deac..9674a73adc2 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
@@ -44,7 +44,6 @@ class Mammal(
                     'zebra': Zebra,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
index bcf9561deac..9674a73adc2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
@@ -44,7 +44,6 @@ class Mammal(
                     'zebra': Zebra,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index b8f8d56a33a..c91d7239b62 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -188,7 +188,6 @@ class MapTest(
                 "direct_map": direct_map,
                 "indirect_map": indirect_map,
             }
-        additional_properties = None
     
     map_map_of_string: typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]
     map_of_enum_string: typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index b8f8d56a33a..c91d7239b62 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -188,7 +188,6 @@ class MapTest(
                 "direct_map": direct_map,
                 "indirect_map": indirect_map,
             }
-        additional_properties = None
     
     map_map_of_string: typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]
     map_of_enum_string: typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index 7b5817d8bb0..29b9a9791cd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -76,7 +76,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "dateTime": dateTime,
                 "map": map,
             }
-        additional_properties = None
     
     uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
     dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index 7b5817d8bb0..29b9a9791cd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -76,7 +76,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "dateTime": dateTime,
                 "map": map,
             }
-        additional_properties = None
     
     uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
     dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
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 c38b3d60a84..e34f80a8361 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
@@ -42,7 +42,6 @@ class Model200Response(
                 "name": name,
                 "class": _class,
             }
-        additional_properties = None
 
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index c38b3d60a84..e34f80a8361 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -42,7 +42,6 @@ class Model200Response(
                 "name": name,
                 "class": _class,
             }
-        additional_properties = None
 
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
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 a7b5839068f..021e54f6570 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
@@ -40,7 +40,6 @@ class ModelReturn(
             __annotations__ = {
                 "return": _return,
             }
-        additional_properties = None
 
     
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index a7b5839068f..021e54f6570 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -40,7 +40,6 @@ class ModelReturn(
             __annotations__ = {
                 "return": _return,
             }
-        additional_properties = None
 
     
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 481513d11f1..75f6eff7623 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -48,7 +48,6 @@ class Money(
                 "amount": amount,
                 "currency": currency,
             }
-        additional_properties = None
     
     amount: MetaOapg.properties.amount
     currency: 'Currency'
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 481513d11f1..75f6eff7623 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -48,7 +48,6 @@ class Money(
                 "amount": amount,
                 "currency": currency,
             }
-        additional_properties = None
     
     amount: MetaOapg.properties.amount
     currency: 'Currency'
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 5780a50d7c5..5c1e6089873 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
@@ -47,7 +47,6 @@ class Name(
                 "snake_case": snake_case,
                 "property": _property,
             }
-        additional_properties = None
 
     
     name: MetaOapg.properties.name
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 5780a50d7c5..5c1e6089873 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -47,7 +47,6 @@ class Name(
                 "snake_case": snake_case,
                 "property": _property,
             }
-        additional_properties = None
 
     
     name: MetaOapg.properties.name
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 397cf37d61b..387f69739c6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -51,7 +51,6 @@ class NoAdditionalProperties(
         
         
             class MetaOapg:
-                additional_properties = None
                 not_schema = schemas.AnyTypeSchema
         
         
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 397cf37d61b..387f69739c6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -51,7 +51,6 @@ class NoAdditionalProperties(
         
         
             class MetaOapg:
-                additional_properties = None
                 not_schema = schemas.AnyTypeSchema
         
         
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 dc709e28777..bf0dcb870b8 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
@@ -180,7 +180,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                         def __new__(
                             cls,
@@ -228,7 +227,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -273,7 +271,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -320,7 +317,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                         def __new__(
                             cls,
@@ -379,7 +375,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -435,7 +430,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -496,7 +490,6 @@ class NullableClass(
         
         
             class MetaOapg:
-                additional_properties = None
         
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index dc709e28777..bf0dcb870b8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -180,7 +180,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                         def __new__(
                             cls,
@@ -228,7 +227,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -273,7 +271,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -320,7 +317,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                         def __new__(
                             cls,
@@ -379,7 +375,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -435,7 +430,6 @@ class NullableClass(
                     
                     
                         class MetaOapg:
-                            additional_properties = None
                     
                     
                         def __new__(
@@ -496,7 +490,6 @@ class NullableClass(
         
         
             class MetaOapg:
-                additional_properties = None
         
         
             def __new__(
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 254951a11bb..6b4d8e6cb9c 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
@@ -35,7 +35,6 @@ class NullableShape(
 
 
     class MetaOapg:
-        additional_properties = None
         one_of_2 = schemas.NoneSchema
         
         @classmethod
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
index 254951a11bb..6b4d8e6cb9c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
@@ -35,7 +35,6 @@ class NullableShape(
 
 
     class MetaOapg:
-        additional_properties = None
         one_of_2 = schemas.NoneSchema
         
         @classmethod
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index f9c54744049..baff47e6cc5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -38,7 +38,6 @@ class NumberOnly(
             __annotations__ = {
                 "JustNumber": JustNumber,
             }
-        additional_properties = None
     
     JustNumber: typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index f9c54744049..baff47e6cc5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -38,7 +38,6 @@ class NumberOnly(
             __annotations__ = {
                 "JustNumber": JustNumber,
             }
-        additional_properties = None
     
     JustNumber: typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
index cdb8ec083e2..40f04be0864 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
@@ -33,7 +33,6 @@ class ObjectInterface(
 
 
     class MetaOapg:
-        additional_properties = None
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
index cdb8ec083e2..40f04be0864 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
@@ -33,7 +33,6 @@ class ObjectInterface(
 
 
     class MetaOapg:
-        additional_properties = None
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index 5b1d9f010e4..ffa697dc48e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -48,7 +48,6 @@ class ObjectModelWithRefProps(
                 "myString": myString,
                 "myBoolean": myBoolean,
             }
-        additional_properties = None
     
     myNumber: typing.Union['NumberWithValidations', schemas.Unset]
     myString: typing.Union[MetaOapg.properties.myString, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index 5b1d9f010e4..ffa697dc48e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -48,7 +48,6 @@ class ObjectModelWithRefProps(
                 "myString": myString,
                 "myBoolean": myBoolean,
             }
-        additional_properties = None
     
     myNumber: typing.Union['NumberWithValidations', schemas.Unset]
     myString: typing.Union[MetaOapg.properties.myString, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index ff381c3807c..8fbf7606554 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -46,7 +46,6 @@ class ObjectWithDecimalProperties(
                 "width": width,
                 "cost": cost,
             }
-        additional_properties = None
     
     length: typing.Union[MetaOapg.properties.length, schemas.Unset]
     width: typing.Union[MetaOapg.properties.width, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index ff381c3807c..8fbf7606554 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -46,7 +46,6 @@ class ObjectWithDecimalProperties(
                 "width": width,
                 "cost": cost,
             }
-        additional_properties = None
     
     length: typing.Union[MetaOapg.properties.length, schemas.Unset]
     width: typing.Union[MetaOapg.properties.width, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index fbfc4073321..0391e75492a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -47,7 +47,6 @@ class ObjectWithDifficultlyNamedProps(
                 "$special[property.name]": special_property_name,
                 "123Number": _123_number,
             }
-        additional_properties = None
     
     
     @typing.overload
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index fbfc4073321..0391e75492a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -47,7 +47,6 @@ class ObjectWithDifficultlyNamedProps(
                 "$special[property.name]": special_property_name,
                 "123Number": _123_number,
             }
-        additional_properties = None
     
     
     @typing.overload
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 d3613ff7589..fe5b30a15f6 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
@@ -42,7 +42,6 @@ class ObjectWithInlineCompositionProperty(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -82,7 +81,6 @@ class ObjectWithInlineCompositionProperty(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 1a1f686aeec..2e91be8b279 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -42,7 +42,6 @@ class ObjectWithInlineCompositionProperty(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -79,7 +78,6 @@ class ObjectWithInlineCompositionProperty(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
index f5464ccbd2f..e5e11b10cb1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
@@ -33,7 +33,6 @@ class ObjectWithValidations(
 
 
     class MetaOapg:
-        additional_properties = None
         min_properties = 2
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
index 4b4c8249b00..6ce555c9c97 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
@@ -33,7 +33,6 @@ class ObjectWithValidations(
 
 
     class MetaOapg:
-        additional_properties = None
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index ac3bb642020..1cc2960508f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -74,7 +74,6 @@ class Order(
                 "status": status,
                 "complete": complete,
             }
-        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index ac3bb642020..1cc2960508f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -74,7 +74,6 @@ class Order(
                 "status": status,
                 "complete": complete,
             }
-        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
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 b92c08bca72..0cf4bd27e3a 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
@@ -43,7 +43,6 @@ class ParentPet(
                     'ChildCat': ChildCat,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
index b92c08bca72..0cf4bd27e3a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
@@ -43,7 +43,6 @@ class ParentPet(
                     'ChildCat': ChildCat,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
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 e45dbbe7838..ae6ec8abfb1 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
@@ -132,7 +132,6 @@ class Pet(
                 "tags": tags,
                 "status": status,
             }
-        additional_properties = None
     
     photoUrls: MetaOapg.properties.photoUrls
     name: MetaOapg.properties.name
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index e45dbbe7838..ae6ec8abfb1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -132,7 +132,6 @@ class Pet(
                 "tags": tags,
                 "status": status,
             }
-        additional_properties = None
     
     photoUrls: MetaOapg.properties.photoUrls
     name: MetaOapg.properties.name
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 ab1e072edf7..0206d074150 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
@@ -43,7 +43,6 @@ class Pig(
                     'DanishPig': DanishPig,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
index ab1e072edf7..0206d074150 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
@@ -43,7 +43,6 @@ class Pig(
                     'DanishPig': DanishPig,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 177d9e24051..3cd05b0e093 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -46,7 +46,6 @@ class Player(
                 "name": name,
                 "enemyPlayer": enemyPlayer,
             }
-        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     enemyPlayer: typing.Union['Player', schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 177d9e24051..3cd05b0e093 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -46,7 +46,6 @@ class Player(
                 "name": name,
                 "enemyPlayer": enemyPlayer,
             }
-        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     enemyPlayer: typing.Union['Player', schemas.Unset]
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 4f11f91edd0..3a160dc1c7b 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
@@ -43,7 +43,6 @@ class Quadrilateral(
                     'SimpleQuadrilateral': SimpleQuadrilateral,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
index 4f11f91edd0..3a160dc1c7b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
@@ -43,7 +43,6 @@ class Quadrilateral(
                     'SimpleQuadrilateral': SimpleQuadrilateral,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
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 34e339d3b4b..1a9acecfd8f 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
@@ -58,7 +58,6 @@ class QuadrilateralInterface(
                 "shapeType": shapeType,
                 "quadrilateralType": quadrilateralType,
             }
-        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 34e339d3b4b..1a9acecfd8f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -58,7 +58,6 @@ class QuadrilateralInterface(
                 "shapeType": shapeType,
                 "quadrilateralType": quadrilateralType,
             }
-        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index f1b8805f6ed..9a98dda9e12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -40,7 +40,6 @@ class ReadOnlyFirst(
                 "bar": bar,
                 "baz": baz,
             }
-        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     baz: typing.Union[MetaOapg.properties.baz, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index f1b8805f6ed..9a98dda9e12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -40,7 +40,6 @@ class ReadOnlyFirst(
                 "bar": bar,
                 "baz": baz,
             }
-        additional_properties = None
     
     bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     baz: typing.Union[MetaOapg.properties.baz, schemas.Unset]
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 013a6192bb5..3e1d8df82d7 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
@@ -33,7 +33,6 @@ class ScaleneTriangle(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class ScaleneTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 013a6192bb5..3e1d8df82d7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -33,7 +33,6 @@ class ScaleneTriangle(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class ScaleneTriangle(
                     __annotations__ = {
                         "triangleType": triangleType,
                     }
-                additional_properties = None
             
             triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
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 b5dba7a727f..5685b1ccd75 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
@@ -43,7 +43,6 @@ class Shape(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
index b5dba7a727f..5685b1ccd75 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
@@ -43,7 +43,6 @@ class Shape(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
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 ab53fa87803..1c5b48d3227 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
@@ -45,7 +45,6 @@ class ShapeOrNull(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
index ab53fa87803..1c5b48d3227 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
@@ -45,7 +45,6 @@ class ShapeOrNull(
                     'Triangle': Triangle,
                 }
             }
-        additional_properties = None
         one_of_0 = schemas.NoneSchema
         
         @classmethod
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 0fd2caece64..feec64cd857 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
@@ -33,7 +33,6 @@ class SimpleQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class SimpleQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index 0fd2caece64..feec64cd857 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -33,7 +33,6 @@ class SimpleQuadrilateral(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_1(
@@ -61,7 +60,6 @@ class SimpleQuadrilateral(
                     __annotations__ = {
                         "quadrilateralType": quadrilateralType,
                     }
-                additional_properties = None
             
             quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
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 a9f83a82247..3af464e9c81 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
@@ -33,7 +33,6 @@ class SomeObject(
 
 
     class MetaOapg:
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
index a9f83a82247..3af464e9c81 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
@@ -33,7 +33,6 @@ class SomeObject(
 
 
     class MetaOapg:
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 15d49a355b7..1480e04f3f7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -40,7 +40,6 @@ class SpecialModelName(
             __annotations__ = {
                 "a": a,
             }
-        additional_properties = None
     
     a: typing.Union[MetaOapg.properties.a, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 15d49a355b7..1480e04f3f7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -40,7 +40,6 @@ class SpecialModelName(
             __annotations__ = {
                 "a": a,
             }
-        additional_properties = None
     
     a: typing.Union[MetaOapg.properties.a, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index e3548b510ed..ca733d17a03 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -40,7 +40,6 @@ class Tag(
                 "id": id,
                 "name": name,
             }
-        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index e3548b510ed..ca733d17a03 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -40,7 +40,6 @@ class Tag(
                 "id": id,
                 "name": name,
             }
-        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
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 c371addec0c..28540914172 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
@@ -44,7 +44,6 @@ class Triangle(
                     'ScaleneTriangle': ScaleneTriangle,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
index c371addec0c..28540914172 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
@@ -44,7 +44,6 @@ class Triangle(
                     'ScaleneTriangle': ScaleneTriangle,
                 }
             }
-        additional_properties = None
         
         @classmethod
         @property
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 065338f5f27..70a5bf16dc4 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
@@ -58,7 +58,6 @@ class TriangleInterface(
                 "shapeType": shapeType,
                 "triangleType": triangleType,
             }
-        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index 065338f5f27..70a5bf16dc4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -58,7 +58,6 @@ class TriangleInterface(
                 "shapeType": shapeType,
                 "triangleType": triangleType,
             }
-        additional_properties = None
 
     
     shapeType: MetaOapg.properties.shapeType
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 aef9cc9f880..dc05af71fd5 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
@@ -50,7 +50,6 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
                 def __new__(
                     cls,
@@ -74,7 +73,6 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
             
                 def __new__(
@@ -96,7 +94,6 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     not_schema = schemas.NoneSchema
             
             
@@ -126,7 +123,6 @@ class User(
                 "anyTypeExceptNullProp": anyTypeExceptNullProp,
                 "anyTypePropNullable": anyTypePropNullable,
             }
-        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     username: typing.Union[MetaOapg.properties.username, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index aef9cc9f880..dc05af71fd5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -50,7 +50,6 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
                 def __new__(
                     cls,
@@ -74,7 +73,6 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = None
             
             
                 def __new__(
@@ -96,7 +94,6 @@ class User(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     not_schema = schemas.NoneSchema
             
             
@@ -126,7 +123,6 @@ class User(
                 "anyTypeExceptNullProp": anyTypeExceptNullProp,
                 "anyTypePropNullable": anyTypePropNullable,
             }
-        additional_properties = None
     
     id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     username: typing.Union[MetaOapg.properties.username, schemas.Unset]
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 ed90d5e64b6..bd673e7263c 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
@@ -59,7 +59,6 @@ class Whale(
                 "hasBaleen": hasBaleen,
                 "hasTeeth": hasTeeth,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index ed90d5e64b6..bd673e7263c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -59,7 +59,6 @@ class Whale(
                 "hasBaleen": hasBaleen,
                 "hasTeeth": hasTeeth,
             }
-        additional_properties = None
     
     className: MetaOapg.properties.className
     hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]
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 b6f9b7b986b..90e6b56f604 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
@@ -147,7 +147,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "password": password,
                 "callback": callback,
             }
-        additional_properties = None
     
     number: MetaOapg.properties.number
     pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index 3f21a3aa58d..8b8a5415f27 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -109,7 +109,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "password": password,
                 "callback": callback,
             }
-        additional_properties = None
     
     number: MetaOapg.properties.number
     pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter
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 26bf015f33a..1dd2a5894e4 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
@@ -367,7 +367,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string_array": enum_form_string_array,
                 "enum_form_string": enum_form_string,
             }
-        additional_properties = None
     
     enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]
     enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index fbc479ed46f..92a5460f431 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -291,7 +291,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string_array": enum_form_string_array,
                 "enum_form_string": enum_form_string,
             }
-        additional_properties = None
     
     enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]
     enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]
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 808ee90145f..95c8cda96af 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
@@ -34,7 +34,6 @@ class CompositionAtRootSchema(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_0(
@@ -88,7 +87,6 @@ class CompositionInPropertySchema(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -128,7 +126,6 @@ class CompositionInPropertySchema(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
@@ -197,7 +194,6 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_0(
@@ -251,7 +247,6 @@ class SchemaForRequestBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -291,7 +286,6 @@ class SchemaForRequestBodyMultipartFormData(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
@@ -338,7 +332,6 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_0(
@@ -392,7 +385,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -432,7 +424,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 5fdbbdce262..0c0eae356f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -32,7 +32,6 @@ class CompositionAtRootSchema(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_0(
@@ -83,7 +82,6 @@ class CompositionInPropertySchema(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -120,7 +118,6 @@ class CompositionInPropertySchema(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
@@ -158,7 +155,6 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_0(
@@ -209,7 +205,6 @@ class SchemaForRequestBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -246,7 +241,6 @@ class SchemaForRequestBodyMultipartFormData(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
@@ -283,7 +277,6 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = None
         
         
         class all_of_0(
@@ -334,7 +327,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
             
             
                 class MetaOapg:
-                    additional_properties = None
                     
                     
                     class all_of_0(
@@ -371,7 +363,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
             __annotations__ = {
                 "someProp": someProp,
             }
-        additional_properties = None
     
     someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index b0575462ed9..e10b2b3d808 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -45,7 +45,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "param": param,
                 "param2": param2,
             }
-        additional_properties = None
     
     param: MetaOapg.properties.param
     param2: MetaOapg.properties.param2
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 83ce9f450e1..0cfa17a12f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -43,7 +43,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "param": param,
                 "param2": param2,
             }
-        additional_properties = None
     
     param: MetaOapg.properties.param
     param2: MetaOapg.properties.param2
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index 9e20a4d1505..5c8cb3f0d0c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -38,7 +38,6 @@ class MapBeanSchema(
             __annotations__ = {
                 "keyword": keyword,
             }
-        additional_properties = None
     
     keyword: typing.Union[MetaOapg.properties.keyword, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index b02a13888de..d09a9336c90 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -36,7 +36,6 @@ class MapBeanSchema(
             __annotations__ = {
                 "keyword": keyword,
             }
-        additional_properties = None
     
     keyword: typing.Union[MetaOapg.properties.keyword, schemas.Unset]
     
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 4b946673b57..85155109ccb 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
@@ -72,7 +72,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "requiredFile": requiredFile,
             }
-        additional_properties = None
     
     requiredFile: MetaOapg.properties.requiredFile
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index 004e0194956..8525427306d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -46,7 +46,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "requiredFile": requiredFile,
             }
-        additional_properties = None
     
     requiredFile: MetaOapg.properties.requiredFile
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
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 51e89493bb4..295ac84382e 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
@@ -46,7 +46,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = None
     
     file: MetaOapg.properties.file
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index e1258163e18..d1211a83dc6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -44,7 +44,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = None
     
     file: MetaOapg.properties.file
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
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 e428452882e..cfa29cd44ef 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
@@ -63,7 +63,6 @@ class SchemaForRequestBodyMultipartFormData(
             __annotations__ = {
                 "files": files,
             }
-        additional_properties = None
     
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 9c8f4857169..a61db7ceae1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -61,7 +61,6 @@ class SchemaForRequestBodyMultipartFormData(
             __annotations__ = {
                 "files": files,
             }
-        additional_properties = None
     
     files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index 26bc88557f2..dcd5750a4a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -44,7 +44,6 @@ class SchemaFor0ResponseBodyApplicationJson(
             __annotations__ = {
                 "string": string,
             }
-        additional_properties = None
     
     string: typing.Union['Foo', schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index 64b3e48e1e6..a15054839fa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -42,7 +42,6 @@ class SchemaFor0ResponseBodyApplicationJson(
             __annotations__ = {
                 "string": string,
             }
-        additional_properties = None
     
     string: typing.Union['Foo', schemas.Unset]
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index 4f80b52283d..76a240ef76e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -67,7 +67,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "name": name,
                 "status": status,
             }
-        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     status: typing.Union[MetaOapg.properties.status, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index e4f65fb12e0..776c1abe30a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -41,7 +41,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "name": name,
                 "status": status,
             }
-        additional_properties = None
     
     name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     status: typing.Union[MetaOapg.properties.status, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 0d66c6982e8..1d83c491f2a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -69,7 +69,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = None
     
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     file: typing.Union[MetaOapg.properties.file, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 3419f62c662..5fc0a77f61f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -43,7 +43,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "additionalMetadata": additionalMetadata,
                 "file": file,
             }
-        additional_properties = None
     
     additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     file: typing.Union[MetaOapg.properties.file, schemas.Unset]
-- 
GitLab


From 30317379daa0acaba66979d3165212a2f4ed29ab Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 11:36:23 -0700
Subject: [PATCH 10/30] Updates criteria for when DictSchema subcalsses are
 created

---
 .../model_templates/schema.handlebars         |  6 +--
 .../model/additional_properties_class.py      | 40 +------------------
 .../model/additional_properties_class.pyi     | 40 +------------------
 ...d_any_of_different_types_no_validations.py | 40 +------------------
 ..._any_of_different_types_no_validations.pyi | 40 +------------------
 .../petstore_api/model/nullable_class.py      | 40 +------------------
 .../petstore_api/model/nullable_class.pyi     | 40 +------------------
 .../petstore_api/model/object_interface.py    | 25 +-----------
 .../petstore_api/model/object_interface.pyi   | 25 +-----------
 .../petstore_api/model/user.py                | 20 +---------
 .../petstore_api/model/user.pyi               | 20 +---------
 11 files changed, 17 insertions(+), 319 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
index 5df38ac7628..1400c9dd034 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
@@ -7,14 +7,10 @@
     {{else}}
         {{#or isMap isArray isAnyType}}
             {{#if isMap}}
-                {{#or hasVars hasValidation getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping }}
+                {{#or hasVars hasValidation getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping additionalProperties }}
 {{> model_templates/schema_dict }}
                 {{else}}
-                    {{#if additionalPropertiesIsAnyType}}
 {{> model_templates/var_equals_cls }}
-                    {{else}}
-{{> model_templates/schema_dict }}
-                    {{/if}}
                 {{/or}}
             {{/if}}
             {{#if isArray}}
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 9a6f18623f3..702a872d68a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -127,44 +127,8 @@ class AdditionalPropertiesClass(
                         **kwargs,
                     )
             anytype_1 = schemas.AnyTypeSchema
-            
-            
-            class map_with_undeclared_properties_anytype_1(
-                schemas.DictSchema
-            ):
-            
-            
-                class MetaOapg:
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'map_with_undeclared_properties_anytype_1':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                    )
-            
-            
-            class map_with_undeclared_properties_anytype_2(
-                schemas.DictSchema
-            ):
-            
-            
-                class MetaOapg:
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'map_with_undeclared_properties_anytype_2':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                    )
+            map_with_undeclared_properties_anytype_1 = schemas.DictSchema
+            map_with_undeclared_properties_anytype_2 = schemas.DictSchema
             
             
             class map_with_undeclared_properties_anytype_3(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 9a6f18623f3..702a872d68a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -127,44 +127,8 @@ class AdditionalPropertiesClass(
                         **kwargs,
                     )
             anytype_1 = schemas.AnyTypeSchema
-            
-            
-            class map_with_undeclared_properties_anytype_1(
-                schemas.DictSchema
-            ):
-            
-            
-                class MetaOapg:
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'map_with_undeclared_properties_anytype_1':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                    )
-            
-            
-            class map_with_undeclared_properties_anytype_2(
-                schemas.DictSchema
-            ):
-            
-            
-                class MetaOapg:
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'map_with_undeclared_properties_anytype_2':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                    )
+            map_with_undeclared_properties_anytype_1 = schemas.DictSchema
+            map_with_undeclared_properties_anytype_2 = schemas.DictSchema
             
             
             class map_with_undeclared_properties_anytype_3(
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 ba673b27114..4eada22cda8 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
@@ -33,49 +33,13 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
 
     class MetaOapg:
-        
-        
-        class any_of_0(
-            schemas.DictSchema
-        ):
-        
-        
-            class MetaOapg:
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'any_of_0':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        any_of_0 = schemas.DictSchema
         any_of_1 = schemas.DateSchema
         any_of_2 = schemas.DateTimeSchema
         any_of_3 = schemas.BinarySchema
         any_of_4 = schemas.StrSchema
         any_of_5 = schemas.StrSchema
-        
-        
-        class any_of_6(
-            schemas.DictSchema
-        ):
-        
-        
-            class MetaOapg:
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'any_of_6':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        any_of_6 = schemas.DictSchema
         any_of_7 = schemas.BoolSchema
         any_of_8 = schemas.NoneSchema
         
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
index ba673b27114..4eada22cda8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
@@ -33,49 +33,13 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
 
     class MetaOapg:
-        
-        
-        class any_of_0(
-            schemas.DictSchema
-        ):
-        
-        
-            class MetaOapg:
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'any_of_0':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        any_of_0 = schemas.DictSchema
         any_of_1 = schemas.DateSchema
         any_of_2 = schemas.DateTimeSchema
         any_of_3 = schemas.BinarySchema
         any_of_4 = schemas.StrSchema
         any_of_5 = schemas.StrSchema
-        
-        
-        class any_of_6(
-            schemas.DictSchema
-        ):
-        
-        
-            class MetaOapg:
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'any_of_6':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        any_of_6 = schemas.DictSchema
         any_of_7 = schemas.BoolSchema
         any_of_8 = schemas.NoneSchema
         
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 bf0dcb870b8..59f91d3791e 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
@@ -172,25 +172,7 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    
-                    
-                    class items(
-                        schemas.DictSchema
-                    ):
-                    
-                    
-                        class MetaOapg:
-                    
-                        def __new__(
-                            cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.Configuration] = None,
-                        ) -> 'items':
-                            return super().__new__(
-                                cls,
-                                *args,
-                                _configuration=_configuration,
-                            )
+                    items = schemas.DictSchema
             
             
                 def __new__(
@@ -309,25 +291,7 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    
-                    
-                    class additional_properties(
-                        schemas.DictSchema
-                    ):
-                    
-                    
-                        class MetaOapg:
-                    
-                        def __new__(
-                            cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.Configuration] = None,
-                        ) -> 'additional_properties':
-                            return super().__new__(
-                                cls,
-                                *args,
-                                _configuration=_configuration,
-                            )
+                    additional_properties = schemas.DictSchema
             
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index bf0dcb870b8..59f91d3791e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -172,25 +172,7 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    
-                    
-                    class items(
-                        schemas.DictSchema
-                    ):
-                    
-                    
-                        class MetaOapg:
-                    
-                        def __new__(
-                            cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.Configuration] = None,
-                        ) -> 'items':
-                            return super().__new__(
-                                cls,
-                                *args,
-                                _configuration=_configuration,
-                            )
+                    items = schemas.DictSchema
             
             
                 def __new__(
@@ -309,25 +291,7 @@ class NullableClass(
             
             
                 class MetaOapg:
-                    
-                    
-                    class additional_properties(
-                        schemas.DictSchema
-                    ):
-                    
-                    
-                        class MetaOapg:
-                    
-                        def __new__(
-                            cls,
-                            *args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.Configuration] = None,
-                        ) -> 'additional_properties':
-                            return super().__new__(
-                                cls,
-                                *args,
-                                _configuration=_configuration,
-                            )
+                    additional_properties = schemas.DictSchema
             
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
index 40f04be0864..97a74edad7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.py
@@ -20,27 +20,4 @@ import uuid  # noqa: F401
 import frozendict  # noqa: F401
 
 from petstore_api import schemas  # noqa: F401
-
-
-class ObjectInterface(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'ObjectInterface':
-        return super().__new__(
-            cls,
-            *args,
-            _configuration=_configuration,
-        )
+ObjectInterface = schemas.DictSchema
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
index 40f04be0864..97a74edad7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_interface.pyi
@@ -20,27 +20,4 @@ import uuid  # noqa: F401
 import frozendict  # noqa: F401
 
 from petstore_api import schemas  # noqa: F401
-
-
-class ObjectInterface(
-    schemas.DictSchema
-):
-    """NOTE: This class is auto generated by OpenAPI Generator.
-    Ref: https://openapi-generator.tech
-
-    Do not edit the class manually.
-    """
-
-
-    class MetaOapg:
-
-    def __new__(
-        cls,
-        *args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) -> 'ObjectInterface':
-        return super().__new__(
-            cls,
-            *args,
-            _configuration=_configuration,
-        )
+ObjectInterface = schemas.DictSchema
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 dc05af71fd5..f616afd04ca 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
@@ -42,25 +42,7 @@ class User(
             password = schemas.StrSchema
             phone = schemas.StrSchema
             userStatus = schemas.Int32Schema
-            
-            
-            class objectWithNoDeclaredProps(
-                schemas.DictSchema
-            ):
-            
-            
-                class MetaOapg:
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'objectWithNoDeclaredProps':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                    )
+            objectWithNoDeclaredProps = schemas.DictSchema
             
             
             class objectWithNoDeclaredPropsNullable(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index dc05af71fd5..f616afd04ca 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -42,25 +42,7 @@ class User(
             password = schemas.StrSchema
             phone = schemas.StrSchema
             userStatus = schemas.Int32Schema
-            
-            
-            class objectWithNoDeclaredProps(
-                schemas.DictSchema
-            ):
-            
-            
-                class MetaOapg:
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                ) -> 'objectWithNoDeclaredProps':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                    )
+            objectWithNoDeclaredProps = schemas.DictSchema
             
             
             class objectWithNoDeclaredPropsNullable(
-- 
GitLab


From 28fff6751f3af685e4e9e76068217c918187e645 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 12:20:53 -0700
Subject: [PATCH 11/30] Adds NotAnyTypeSchema when a schema is False

---
 .../openapitools/codegen/DefaultCodegen.java  |  4 ++--
 .../model_templates/schema.handlebars         |  4 ++++
 .../model_templates/var_equals_cls.handlebars |  2 +-
 .../python-experimental/schemas.handlebars    | 23 +++++++++++++++++++
 .../docs/models/AppleReq.md                   |  1 -
 .../docs/models/BananaReq.md                  |  1 -
 .../docs/models/NoAdditionalProperties.md     |  1 -
 .../model/additional_properties_class.py      | 22 +-----------------
 .../model/additional_properties_class.pyi     | 22 +-----------------
 .../petstore_api/model/apple_req.py           | 22 +-----------------
 .../petstore_api/model/apple_req.pyi          | 22 +-----------------
 .../petstore_api/model/banana_req.py          | 22 +-----------------
 .../petstore_api/model/banana_req.pyi         | 22 +-----------------
 .../model/no_additional_properties.py         | 22 +-----------------
 .../model/no_additional_properties.pyi        | 22 +-----------------
 .../petstore_api/schemas.py                   | 23 +++++++++++++++++++
 16 files changed, 61 insertions(+), 174 deletions(-)

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 517e7a207ba..777889ef637 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
@@ -2804,7 +2804,7 @@ public class DefaultCodegen implements CodegenConfig {
         if (schema.equals(trueSchema)) {
             m.setIsBooleanSchemaTrue(true);
         } else if (schema.equals(falseSchema)) {
-            m.setIsBooleanSchemaTrue(true);
+            m.setIsBooleanSchemaFalse(true);
         }
         // unalias schema
         schema = unaliasSchema(schema);
@@ -3635,7 +3635,7 @@ public class DefaultCodegen implements CodegenConfig {
         if (p.equals(trueSchema)) {
             property.setIsBooleanSchemaTrue(true);
         } else if (p.equals(falseSchema)) {
-            property.setIsBooleanSchemaTrue(true);
+            property.setIsBooleanSchemaFalse(true);
         }
 
         // unalias schema
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
index 1400c9dd034..24bcf8ab357 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/schema.handlebars
@@ -1,5 +1,9 @@
 {{#if composedSchemas}}
+    {{#if getIsBooleanSchemaFalse}}
+{{> model_templates/var_equals_cls }}
+    {{else}}
 {{> model_templates/schema_composed_or_anytype }}
+    {{/if}}
 {{/if}}
 {{#unless composedSchemas}}
     {{#if getHasMultipleTypes}}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/var_equals_cls.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/var_equals_cls.handlebars
index eccd201f244..f3a3c80a055 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/var_equals_cls.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/var_equals_cls.handlebars
@@ -1 +1 @@
-{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#if complexType}}{{complexType}}{{else}}schemas.{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}Str{{/if}}{{#if isByteArray}}Str{{/if}}{{#if getIsUuid}}UUID{{/if}}{{#if isDate}}Date{{/if}}{{#if isDateTime}}DateTime{{/if}}{{#if isDecimal}}Decimal{{/if}}{{#if isUnboundedInteger}}Int{{/if}}{{#if isShort}}Int32{{/if}}{{#if isLong}}Int64{{/if}}{{#if isFloat}}Float32{{/if}}{{#if isDouble}}Float64{{/if}}{{#if isNumber}}Number{{/if}}{{#if isBoolean}}Bool{{/if}}{{#if isBinary}}Binary{{/if}}Schema{{/if}}
+{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#or getIsBooleanSchemaTrue getIsBooleanSchemaFalse}}{{#if getIsBooleanSchemaTrue}}schemas.AnyTypeSchema{{else}}schemas.NotAnyTypeSchema{{/if}}{{else}}{{#if complexType}}{{complexType}}{{else}}schemas.{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}Str{{/if}}{{#if isByteArray}}Str{{/if}}{{#if getIsUuid}}UUID{{/if}}{{#if isDate}}Date{{/if}}{{#if isDateTime}}DateTime{{/if}}{{#if isDecimal}}Decimal{{/if}}{{#if isUnboundedInteger}}Int{{/if}}{{#if isShort}}Int32{{/if}}{{#if isLong}}Int64{{/if}}{{#if isFloat}}Float32{{/if}}{{#if isDouble}}Float64{{/if}}{{#if isNumber}}Number{{/if}}{{#if isBoolean}}Bool{{/if}}{{#if isBinary}}Binary{{/if}}Schema{{/if}}{{/or}}
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 d306f20ea86..5324b5c921e 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -2144,6 +2144,29 @@ class AnyTypeSchema(
     pass
 
 
+class NotAnyTypeSchema(
+    schemas.ComposedSchema,
+):
+    """
+    Does not allow inputs in of AnyType
+    Note: validations on this class are never run because the code knows that no inputs will ever validate
+    """
+
+    class MetaOapg:
+        not_schema = schemas.AnyTypeSchema
+
+    def __new__(
+        cls,
+        *args,
+        _configuration: typing.Optional[schemas.Configuration] = None,
+    ) > 'NotAnyTypeSchema':
+        return super().__new__(
+            cls,
+            *args,
+            _configuration=_configuration,
+        )
+
+
 class DictSchema(
     SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
index 0cf330faa83..17b7d6db227 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/AppleReq.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **cultivar** | **str** |  | 
 **mealy** | **bool** |  | [optional] 
-**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md b/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
index 70837d41d42..a386d04fd26 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/BananaReq.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **lengthCm** | **int, float** |  | 
 **sweet** | **bool** |  | [optional] 
-**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md b/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
index d22b796736f..0f916cd6d88 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/models/NoAdditionalProperties.md
@@ -5,7 +5,6 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **int** |  | 
 **petId** | **int** |  | [optional] 
-**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 702a872d68a..0b0ef0481ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -168,27 +168,7 @@ class AdditionalPropertiesClass(
             
             
                 class MetaOapg:
-                    
-                    
-                    class additional_properties(
-                        schemas.ComposedSchema,
-                    ):
-                    
-                    
-                        class MetaOapg:
-                            not_schema = schemas.AnyTypeSchema
-                    
-                    
-                        def __new__(
-                            cls,
-                            *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                            _configuration: typing.Optional[schemas.Configuration] = None,
-                        ) -> 'additional_properties':
-                            return super().__new__(
-                                cls,
-                                *args,
-                                _configuration=_configuration,
-                            )
+                    additional_properties = schemas.NotAnyTypeSchema
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 702a872d68a..0b0ef0481ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -168,27 +168,7 @@ class AdditionalPropertiesClass(
             
             
                 class MetaOapg:
-                    
-                    
-                    class additional_properties(
-                        schemas.ComposedSchema,
-                    ):
-                    
-                    
-                        class MetaOapg:
-                            not_schema = schemas.AnyTypeSchema
-                    
-                    
-                        def __new__(
-                            cls,
-                            *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                            _configuration: typing.Optional[schemas.Configuration] = None,
-                        ) -> 'additional_properties':
-                            return super().__new__(
-                                cls,
-                                *args,
-                                _configuration=_configuration,
-                            )
+                    additional_properties = schemas.NotAnyTypeSchema
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index 58c4c97372c..56d50a0a061 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -43,27 +43,7 @@ class AppleReq(
                 "cultivar": cultivar,
                 "mealy": mealy,
             }
-        
-        
-        class additional_properties(
-            schemas.ComposedSchema,
-        ):
-        
-        
-            class MetaOapg:
-                not_schema = schemas.AnyTypeSchema
-        
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'additional_properties':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        additional_properties = schemas.NotAnyTypeSchema
     
     cultivar: MetaOapg.properties.cultivar
     mealy: typing.Union[MetaOapg.properties.mealy, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index 58c4c97372c..56d50a0a061 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -43,27 +43,7 @@ class AppleReq(
                 "cultivar": cultivar,
                 "mealy": mealy,
             }
-        
-        
-        class additional_properties(
-            schemas.ComposedSchema,
-        ):
-        
-        
-            class MetaOapg:
-                not_schema = schemas.AnyTypeSchema
-        
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'additional_properties':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        additional_properties = schemas.NotAnyTypeSchema
     
     cultivar: MetaOapg.properties.cultivar
     mealy: typing.Union[MetaOapg.properties.mealy, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 77458087c1d..81ef54ef6bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -43,27 +43,7 @@ class BananaReq(
                 "lengthCm": lengthCm,
                 "sweet": sweet,
             }
-        
-        
-        class additional_properties(
-            schemas.ComposedSchema,
-        ):
-        
-        
-            class MetaOapg:
-                not_schema = schemas.AnyTypeSchema
-        
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'additional_properties':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        additional_properties = schemas.NotAnyTypeSchema
     
     lengthCm: MetaOapg.properties.lengthCm
     sweet: typing.Union[MetaOapg.properties.sweet, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 77458087c1d..81ef54ef6bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -43,27 +43,7 @@ class BananaReq(
                 "lengthCm": lengthCm,
                 "sweet": sweet,
             }
-        
-        
-        class additional_properties(
-            schemas.ComposedSchema,
-        ):
-        
-        
-            class MetaOapg:
-                not_schema = schemas.AnyTypeSchema
-        
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'additional_properties':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        additional_properties = schemas.NotAnyTypeSchema
     
     lengthCm: MetaOapg.properties.lengthCm
     sweet: typing.Union[MetaOapg.properties.sweet, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 387f69739c6..905e3fe3f73 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -43,27 +43,7 @@ class NoAdditionalProperties(
                 "id": id,
                 "petId": petId,
             }
-        
-        
-        class additional_properties(
-            schemas.ComposedSchema,
-        ):
-        
-        
-            class MetaOapg:
-                not_schema = schemas.AnyTypeSchema
-        
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'additional_properties':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        additional_properties = schemas.NotAnyTypeSchema
     
     id: MetaOapg.properties.id
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 387f69739c6..905e3fe3f73 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -43,27 +43,7 @@ class NoAdditionalProperties(
                 "id": id,
                 "petId": petId,
             }
-        
-        
-        class additional_properties(
-            schemas.ComposedSchema,
-        ):
-        
-        
-            class MetaOapg:
-                not_schema = schemas.AnyTypeSchema
-        
-        
-            def __new__(
-                cls,
-                *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                _configuration: typing.Optional[schemas.Configuration] = None,
-            ) -> 'additional_properties':
-                return super().__new__(
-                    cls,
-                    *args,
-                    _configuration=_configuration,
-                )
+        additional_properties = schemas.NotAnyTypeSchema
     
     id: MetaOapg.properties.id
     petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
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 3fdcfe29d8d..eb442a3f52f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -2151,6 +2151,29 @@ class AnyTypeSchema(
     pass
 
 
+class NotAnyTypeSchema(
+    schemas.ComposedSchema,
+):
+    """
+    Does not allow inputs in of AnyType
+    Note: validations on this class are never run because the code knows that no inputs will ever validate
+    """
+
+    class MetaOapg:
+        not_schema = schemas.AnyTypeSchema
+
+    def __new__(
+        cls,
+        *args,
+        _configuration: typing.Optional[schemas.Configuration] = None,
+    ) > 'NotAnyTypeSchema':
+        return super().__new__(
+            cls,
+            *args,
+            _configuration=_configuration,
+        )
+
+
 class DictSchema(
     SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
-- 
GitLab


From c4cbfed42c7f6f11d46727288fa8d4f95e6e6d9a Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 13:02:54 -0700
Subject: [PATCH 12/30] Updates new kwargs signature

---
 .../model_templates/new.handlebars            | 12 +++++++++
 .../schema_composed_or_anytype.handlebars     |  4 +--
 .../python-experimental/schemas.handlebars    |  8 +++---
 .../model/additional_properties_class.py      |  4 +--
 .../model/additional_properties_class.pyi     |  4 +--
 .../petstore_api/model/animal.py              |  2 ++
 .../petstore_api/model/animal.pyi             |  2 ++
 .../petstore_api/model/any_type_not_string.py |  2 ++
 .../model/any_type_not_string.pyi             |  2 ++
 .../petstore_api/model/api_response.py        |  2 ++
 .../petstore_api/model/api_response.pyi       |  2 ++
 .../petstore_api/model/apple.py               |  2 ++
 .../petstore_api/model/apple.pyi              |  2 ++
 .../petstore_api/model/apple_req.py           |  2 --
 .../petstore_api/model/apple_req.pyi          |  2 --
 .../model/array_of_array_of_number_only.py    |  2 ++
 .../model/array_of_array_of_number_only.pyi   |  2 ++
 .../model/array_of_number_only.py             |  2 ++
 .../model/array_of_number_only.pyi            |  2 ++
 .../petstore_api/model/array_test.py          |  2 ++
 .../petstore_api/model/array_test.pyi         |  2 ++
 .../petstore_api/model/banana.py              |  2 ++
 .../petstore_api/model/banana.pyi             |  2 ++
 .../petstore_api/model/banana_req.py          |  2 --
 .../petstore_api/model/banana_req.pyi         |  2 --
 .../petstore_api/model/basque_pig.py          |  2 ++
 .../petstore_api/model/basque_pig.pyi         |  2 ++
 .../petstore_api/model/capitalization.py      |  2 ++
 .../petstore_api/model/capitalization.pyi     |  2 ++
 .../petstore_api/model/cat.py                 |  4 +++
 .../petstore_api/model/cat.pyi                |  4 +++
 .../petstore_api/model/category.py            |  2 ++
 .../petstore_api/model/category.pyi           |  2 ++
 .../petstore_api/model/child_cat.py           |  4 +++
 .../petstore_api/model/child_cat.pyi          |  4 +++
 .../petstore_api/model/class_model.py         |  2 ++
 .../petstore_api/model/class_model.pyi        |  2 ++
 .../petstore_api/model/client.py              |  2 ++
 .../petstore_api/model/client.pyi             |  2 ++
 .../model/complex_quadrilateral.py            |  4 +++
 .../model/complex_quadrilateral.pyi           |  4 +++
 ...d_any_of_different_types_no_validations.py |  2 ++
 ..._any_of_different_types_no_validations.pyi |  2 ++
 .../petstore_api/model/composed_object.py     |  2 ++
 .../petstore_api/model/composed_object.pyi    |  2 ++
 .../model/composed_one_of_different_types.py  |  4 +++
 .../model/composed_one_of_different_types.pyi |  4 +++
 .../petstore_api/model/danish_pig.py          |  2 ++
 .../petstore_api/model/danish_pig.pyi         |  2 ++
 .../petstore_api/model/dog.py                 |  4 +++
 .../petstore_api/model/dog.pyi                |  4 +++
 .../petstore_api/model/enum_arrays.py         |  2 ++
 .../petstore_api/model/enum_arrays.pyi        |  2 ++
 .../petstore_api/model/enum_test.py           |  2 ++
 .../petstore_api/model/enum_test.pyi          |  2 ++
 .../model/equilateral_triangle.py             |  4 +++
 .../model/equilateral_triangle.pyi            |  4 +++
 .../petstore_api/model/file.py                |  2 ++
 .../petstore_api/model/file.pyi               |  2 ++
 .../model/file_schema_test_class.py           |  2 ++
 .../model/file_schema_test_class.pyi          |  2 ++
 .../petstore_api/model/foo.py                 |  2 ++
 .../petstore_api/model/foo.pyi                |  2 ++
 .../petstore_api/model/format_test.py         |  2 ++
 .../petstore_api/model/format_test.pyi        |  2 ++
 .../petstore_api/model/fruit.py               |  2 ++
 .../petstore_api/model/fruit.pyi              |  2 ++
 .../petstore_api/model/fruit_req.py           |  2 ++
 .../petstore_api/model/fruit_req.pyi          |  2 ++
 .../petstore_api/model/gm_fruit.py            |  2 ++
 .../petstore_api/model/gm_fruit.pyi           |  2 ++
 .../petstore_api/model/grandparent_animal.py  |  2 ++
 .../petstore_api/model/grandparent_animal.pyi |  2 ++
 .../petstore_api/model/has_only_read_only.py  |  2 ++
 .../petstore_api/model/has_only_read_only.pyi |  2 ++
 .../petstore_api/model/health_check_result.py |  2 ++
 .../model/health_check_result.pyi             |  2 ++
 .../petstore_api/model/isosceles_triangle.py  |  4 +++
 .../petstore_api/model/isosceles_triangle.pyi |  4 +++
 .../petstore_api/model/mammal.py              |  2 ++
 .../petstore_api/model/mammal.pyi             |  2 ++
 .../petstore_api/model/map_test.py            |  2 ++
 .../petstore_api/model/map_test.pyi           |  2 ++
 ...perties_and_additional_properties_class.py |  2 ++
 ...erties_and_additional_properties_class.pyi |  2 ++
 .../petstore_api/model/model200_response.py   |  2 ++
 .../petstore_api/model/model200_response.pyi  |  2 ++
 .../petstore_api/model/model_return.py        |  2 ++
 .../petstore_api/model/model_return.pyi       |  2 ++
 .../petstore_api/model/money.py               |  2 ++
 .../petstore_api/model/money.pyi              |  2 ++
 .../petstore_api/model/name.py                |  2 ++
 .../petstore_api/model/name.pyi               |  2 ++
 .../model/no_additional_properties.py         |  2 --
 .../model/no_additional_properties.pyi        |  2 --
 .../petstore_api/model/nullable_class.py      | 25 ++++++++-----------
 .../petstore_api/model/nullable_class.pyi     | 25 ++++++++-----------
 .../petstore_api/model/nullable_shape.py      |  2 ++
 .../petstore_api/model/nullable_shape.pyi     |  2 ++
 .../petstore_api/model/number_only.py         |  2 ++
 .../petstore_api/model/number_only.pyi        |  2 ++
 .../model/object_model_with_ref_props.py      |  2 ++
 .../model/object_model_with_ref_props.pyi     |  2 ++
 .../model/object_with_decimal_properties.py   |  2 ++
 .../model/object_with_decimal_properties.pyi  |  2 ++
 .../object_with_difficultly_named_props.py    |  2 ++
 .../object_with_difficultly_named_props.pyi   |  2 ++
 ...object_with_inline_composition_property.py |  4 +++
 ...bject_with_inline_composition_property.pyi |  4 +++
 .../model/object_with_validations.py          |  2 ++
 .../model/object_with_validations.pyi         |  2 ++
 .../petstore_api/model/order.py               |  2 ++
 .../petstore_api/model/order.pyi              |  2 ++
 .../petstore_api/model/parent_pet.py          |  2 ++
 .../petstore_api/model/parent_pet.pyi         |  2 ++
 .../petstore_api/model/pet.py                 |  2 ++
 .../petstore_api/model/pet.pyi                |  2 ++
 .../petstore_api/model/pig.py                 |  2 ++
 .../petstore_api/model/pig.pyi                |  2 ++
 .../petstore_api/model/player.py              |  2 ++
 .../petstore_api/model/player.pyi             |  2 ++
 .../petstore_api/model/quadrilateral.py       |  2 ++
 .../petstore_api/model/quadrilateral.pyi      |  2 ++
 .../model/quadrilateral_interface.py          |  2 ++
 .../model/quadrilateral_interface.pyi         |  2 ++
 .../petstore_api/model/read_only_first.py     |  2 ++
 .../petstore_api/model/read_only_first.pyi    |  2 ++
 .../petstore_api/model/scalene_triangle.py    |  4 +++
 .../petstore_api/model/scalene_triangle.pyi   |  4 +++
 .../petstore_api/model/shape.py               |  2 ++
 .../petstore_api/model/shape.pyi              |  2 ++
 .../petstore_api/model/shape_or_null.py       |  2 ++
 .../petstore_api/model/shape_or_null.pyi      |  2 ++
 .../model/simple_quadrilateral.py             |  4 +++
 .../model/simple_quadrilateral.pyi            |  4 +++
 .../petstore_api/model/some_object.py         |  2 ++
 .../petstore_api/model/some_object.pyi        |  2 ++
 .../petstore_api/model/special_model_name.py  |  2 ++
 .../petstore_api/model/special_model_name.pyi |  2 ++
 .../petstore_api/model/tag.py                 |  2 ++
 .../petstore_api/model/tag.pyi                |  2 ++
 .../petstore_api/model/triangle.py            |  2 ++
 .../petstore_api/model/triangle.pyi           |  2 ++
 .../petstore_api/model/triangle_interface.py  |  2 ++
 .../petstore_api/model/triangle_interface.pyi |  2 ++
 .../petstore_api/model/user.py                |  9 ++++---
 .../petstore_api/model/user.pyi               |  9 ++++---
 .../petstore_api/model/whale.py               |  2 ++
 .../petstore_api/model/whale.pyi              |  2 ++
 .../petstore_api/paths/fake_1/post.py         |  2 ++
 .../petstore_api/paths/fake_1/post.pyi        |  2 ++
 .../petstore_api/paths/fake_2/get.py          |  2 ++
 .../petstore_api/paths/fake_2/get.pyi         |  2 ++
 .../paths/fake_inline_composition_/post.py    | 18 +++++++++++++
 .../paths/fake_inline_composition_/post.pyi   | 18 +++++++++++++
 .../paths/fake_json_form_data/get.py          |  2 ++
 .../paths/fake_json_form_data/get.pyi         |  2 ++
 .../paths/fake_obj_in_query/get.py            |  2 ++
 .../paths/fake_obj_in_query/get.pyi           |  2 ++
 .../post.py                                   |  2 ++
 .../post.pyi                                  |  2 ++
 .../paths/fake_upload_file/post.py            |  2 ++
 .../paths/fake_upload_file/post.pyi           |  2 ++
 .../paths/fake_upload_files/post.py           |  2 ++
 .../paths/fake_upload_files/post.pyi          |  2 ++
 .../petstore_api/paths/foo/get.py             |  2 ++
 .../petstore_api/paths/foo/get.pyi            |  2 ++
 .../petstore_api/paths/pet_pet_id_3/post.py   |  2 ++
 .../petstore_api/paths/pet_pet_id_3/post.pyi  |  2 ++
 .../paths/pet_pet_id_upload_image/post.py     |  2 ++
 .../paths/pet_pet_id_upload_image/post.pyi    |  2 ++
 .../petstore_api/schemas.py                   |  8 +++---
 172 files changed, 442 insertions(+), 62 deletions(-)

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 015c07b9a70..429ff63c7e3 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
@@ -37,11 +37,17 @@ def __new__(
 {{/each}}
     _configuration: typing.Optional[schemas.Configuration] = None,
 {{#with additionalProperties}}
+{{#unless getIsBooleanSchemaFalse}}
 {{#if complexType}}
     **kwargs: '{{complexType}}',
 {{else}}
     **kwargs: typing.Union[MetaOapg.additional_properties, {{> model_templates/schema_python_types }}],
 {{/if}}
+{{/unless}}
+{{else}}
+{{#or isMap isAnyType}}
+    **kwargs,
+{{/or}}
 {{/with}}
 ) -> '{{> model_templates/classname }}':
     return super().__new__(
@@ -75,6 +81,12 @@ def __new__(
 {{/each}}
         _configuration=_configuration,
 {{#with additionalProperties}}
+{{#unless getIsBooleanSchemaFalse}}
+        **kwargs,
+{{/unless}}
+{{else}}
+{{#or isMap isAnyType}}
         **kwargs,
+{{/or}}
 {{/with}}
     )
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 c8bdddc4226..61067e43a25 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,7 +31,7 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 {{/if}}
     """
 {{/if}}
-{{#or hasValidation composedSchemas isMap isAnyType getItems}}
+{{#or hasValidation composedSchemas getItems additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars}}
 
 
     class MetaOapg:
@@ -46,7 +46,7 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
         {{> model_templates/schema }}
 {{/if}}
 {{/with}}
-{{#or isMap isAnyType}}
+{{#or additionalProperties getRequiredVarsMap getHasDiscriminatorWithNonEmptyMapping vars}}
         {{> model_templates/dict_partial }}
 {{/or}}
 {{#unless isStub}}
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 5324b5c921e..40a9ceb39f4 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -2145,7 +2145,7 @@ class AnyTypeSchema(
 
 
 class NotAnyTypeSchema(
-    schemas.ComposedSchema,
+    ComposedSchema,
 ):
     """
     Does not allow inputs in of AnyType
@@ -2153,13 +2153,13 @@ class NotAnyTypeSchema(
     """
 
     class MetaOapg:
-        not_schema = schemas.AnyTypeSchema
+        not_schema = AnyTypeSchema
 
     def __new__(
         cls,
         *args,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) > 'NotAnyTypeSchema':
+        _configuration: typing.Optional[Configuration] = None,
+    ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
             *args,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 0b0ef0481ea..a74e323367e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -183,13 +183,11 @@ class AdditionalPropertiesClass(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'empty_map':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             
             
@@ -288,6 +286,7 @@ class AdditionalPropertiesClass(
         empty_map: typing.Union[MetaOapg.properties.empty_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -301,4 +300,5 @@ class AdditionalPropertiesClass(
             empty_map=empty_map,
             map_with_undeclared_properties_string=map_with_undeclared_properties_string,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 0b0ef0481ea..a74e323367e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -183,13 +183,11 @@ class AdditionalPropertiesClass(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 ) -> 'empty_map':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
-                        **kwargs,
                     )
             
             
@@ -288,6 +286,7 @@ class AdditionalPropertiesClass(
         empty_map: typing.Union[MetaOapg.properties.empty_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -301,4 +300,5 @@ class AdditionalPropertiesClass(
             empty_map=empty_map,
             map_with_undeclared_properties_string=map_with_undeclared_properties_string,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 375a1cbb232..8e91168967e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -79,6 +79,7 @@ class Animal(
         className: typing.Union[MetaOapg.properties.className, str, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Animal':
         return super().__new__(
             cls,
@@ -86,6 +87,7 @@ class Animal(
             className=className,
             color=color,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.cat import Cat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 375a1cbb232..8e91168967e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -79,6 +79,7 @@ class Animal(
         className: typing.Union[MetaOapg.properties.className, str, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Animal':
         return super().__new__(
             cls,
@@ -86,6 +87,7 @@ class Animal(
             className=className,
             color=color,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.cat import Cat
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 91e9ce6b088..8f635cd6001 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
@@ -40,9 +40,11 @@ class AnyTypeNotString(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
index 91e9ce6b088..8f635cd6001 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
@@ -40,9 +40,11 @@ class AnyTypeNotString(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 92dc5ee9c36..805be04364f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -73,6 +73,7 @@ class ApiResponse(
         type: typing.Union[MetaOapg.properties.type, str, schemas.Unset] = schemas.unset,
         message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
@@ -81,4 +82,5 @@ class ApiResponse(
             type=type,
             message=message,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 92dc5ee9c36..805be04364f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -73,6 +73,7 @@ class ApiResponse(
         type: typing.Union[MetaOapg.properties.type, str, schemas.Unset] = schemas.unset,
         message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
@@ -81,4 +82,5 @@ class ApiResponse(
             type=type,
             message=message,
             _configuration=_configuration,
+            **kwargs,
         )
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 c0c10005247..c25c35f49d0 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
@@ -96,10 +96,12 @@ class Apple(
         *args: typing.Union[dict, frozendict.frozendict, None, ],
         origin: typing.Union[MetaOapg.properties.origin, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Apple':
         return super().__new__(
             cls,
             *args,
             origin=origin,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index 1e67eb867b9..39beb5ff696 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -83,10 +83,12 @@ class Apple(
         *args: typing.Union[dict, frozendict.frozendict, None, ],
         origin: typing.Union[MetaOapg.properties.origin, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Apple':
         return super().__new__(
             cls,
             *args,
             origin=origin,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index 56d50a0a061..96269e9cdd6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -72,7 +72,6 @@ class AppleReq(
         cultivar: typing.Union[MetaOapg.properties.cultivar, str, ],
         mealy: typing.Union[MetaOapg.properties.mealy, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AppleReq':
         return super().__new__(
             cls,
@@ -80,5 +79,4 @@ class AppleReq(
             cultivar=cultivar,
             mealy=mealy,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index 56d50a0a061..96269e9cdd6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -72,7 +72,6 @@ class AppleReq(
         cultivar: typing.Union[MetaOapg.properties.cultivar, str, ],
         mealy: typing.Union[MetaOapg.properties.mealy, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'AppleReq':
         return super().__new__(
             cls,
@@ -80,5 +79,4 @@ class AppleReq(
             cultivar=cultivar,
             mealy=mealy,
             _configuration=_configuration,
-            **kwargs,
         )
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 1c113b57b6a..97e09692c58 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
@@ -103,10 +103,12 @@ class ArrayOfArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayArrayNumber=ArrayArrayNumber,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index 1c113b57b6a..97e09692c58 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -103,10 +103,12 @@ class ArrayOfArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayArrayNumber=ArrayArrayNumber,
             _configuration=_configuration,
+            **kwargs,
         )
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 fd168beceea..72754519cd1 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
@@ -81,10 +81,12 @@ class ArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayNumber=ArrayNumber,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index fd168beceea..72754519cd1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -81,10 +81,12 @@ class ArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
             *args,
             ArrayNumber=ArrayNumber,
             _configuration=_configuration,
+            **kwargs,
         )
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 cf34969ca8d..9aa1f23d34e 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
@@ -187,6 +187,7 @@ class ArrayTest(
         array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, tuple, schemas.Unset] = schemas.unset,
         array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
@@ -195,6 +196,7 @@ class ArrayTest(
             array_array_of_integer=array_array_of_integer,
             array_array_of_model=array_array_of_model,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.read_only_first import ReadOnlyFirst
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index cf34969ca8d..9aa1f23d34e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -187,6 +187,7 @@ class ArrayTest(
         array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, tuple, schemas.Unset] = schemas.unset,
         array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
@@ -195,6 +196,7 @@ class ArrayTest(
             array_array_of_integer=array_array_of_integer,
             array_array_of_model=array_array_of_model,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.read_only_first import ReadOnlyFirst
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index 36e1b68bc76..36acd0a6a82 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -62,10 +62,12 @@ class Banana(
         *args: typing.Union[dict, frozendict.frozendict, ],
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Banana':
         return super().__new__(
             cls,
             *args,
             lengthCm=lengthCm,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index 36e1b68bc76..36acd0a6a82 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -62,10 +62,12 @@ class Banana(
         *args: typing.Union[dict, frozendict.frozendict, ],
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Banana':
         return super().__new__(
             cls,
             *args,
             lengthCm=lengthCm,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 81ef54ef6bb..6b1ebf3453d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -72,7 +72,6 @@ class BananaReq(
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         sweet: typing.Union[MetaOapg.properties.sweet, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'BananaReq':
         return super().__new__(
             cls,
@@ -80,5 +79,4 @@ class BananaReq(
             lengthCm=lengthCm,
             sweet=sweet,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 81ef54ef6bb..6b1ebf3453d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -72,7 +72,6 @@ class BananaReq(
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         sweet: typing.Union[MetaOapg.properties.sweet, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'BananaReq':
         return super().__new__(
             cls,
@@ -80,5 +79,4 @@ class BananaReq(
             lengthCm=lengthCm,
             sweet=sweet,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index b7d968ebbfa..fce5cf6c1c8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -76,10 +76,12 @@ class BasquePig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'BasquePig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index b7d968ebbfa..fce5cf6c1c8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -76,10 +76,12 @@ class BasquePig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'BasquePig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index 618ea4052ca..5ae0f8a3cc5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -94,6 +94,7 @@ class Capitalization(
         SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, str, schemas.Unset] = schemas.unset,
         ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Capitalization':
         return super().__new__(
             cls,
@@ -105,4 +106,5 @@ class Capitalization(
             SCA_ETH_Flow_Points=SCA_ETH_Flow_Points,
             ATT_NAME=ATT_NAME,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index 618ea4052ca..5ae0f8a3cc5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -94,6 +94,7 @@ class Capitalization(
         SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, str, schemas.Unset] = schemas.unset,
         ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Capitalization':
         return super().__new__(
             cls,
@@ -105,4 +106,5 @@ class Capitalization(
             SCA_ETH_Flow_Points=SCA_ETH_Flow_Points,
             ATT_NAME=ATT_NAME,
             _configuration=_configuration,
+            **kwargs,
         )
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 8c6a623144d..22bbff2a402 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
@@ -67,12 +67,14 @@ class Cat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 declawed: typing.Union[MetaOapg.properties.declawed, bool, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     declawed=declawed,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -96,11 +98,13 @@ class Cat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Cat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index 8c6a623144d..22bbff2a402 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -67,12 +67,14 @@ class Cat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 declawed: typing.Union[MetaOapg.properties.declawed, bool, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     declawed=declawed,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -96,11 +98,13 @@ class Cat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Cat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
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 b1d72c93b6b..67abae57cae 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
@@ -69,6 +69,7 @@ class Category(
         name: typing.Union[MetaOapg.properties.name, str, ],
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Category':
         return super().__new__(
             cls,
@@ -76,4 +77,5 @@ class Category(
             name=name,
             id=id,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index b1d72c93b6b..67abae57cae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -69,6 +69,7 @@ class Category(
         name: typing.Union[MetaOapg.properties.name, str, ],
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Category':
         return super().__new__(
             cls,
@@ -76,4 +77,5 @@ class Category(
             name=name,
             id=id,
             _configuration=_configuration,
+            **kwargs,
         )
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 1ee8d9db1f1..f0ef7326ba4 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
@@ -67,12 +67,14 @@ class ChildCat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     name=name,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -96,11 +98,13 @@ class ChildCat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ChildCat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.parent_pet import ParentPet
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 1ee8d9db1f1..f0ef7326ba4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -67,12 +67,14 @@ class ChildCat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     name=name,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -96,11 +98,13 @@ class ChildCat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ChildCat':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.parent_pet import ParentPet
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 c6676720d37..2b6ba9650e4 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
@@ -62,10 +62,12 @@ class ClassModel(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _class: typing.Union[MetaOapg.properties._class, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ClassModel':
         return super().__new__(
             cls,
             *args,
             _class=_class,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index c6676720d37..2b6ba9650e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -62,10 +62,12 @@ class ClassModel(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _class: typing.Union[MetaOapg.properties._class, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ClassModel':
         return super().__new__(
             cls,
             *args,
             _class=_class,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 85b99215a99..4ef7a97a89a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -59,10 +59,12 @@ class Client(
         *args: typing.Union[dict, frozendict.frozendict, ],
         client: typing.Union[MetaOapg.properties.client, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Client':
         return super().__new__(
             cls,
             *args,
             client=client,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 85b99215a99..4ef7a97a89a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -59,10 +59,12 @@ class Client(
         *args: typing.Union[dict, frozendict.frozendict, ],
         client: typing.Union[MetaOapg.properties.client, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Client':
         return super().__new__(
             cls,
             *args,
             client=client,
             _configuration=_configuration,
+            **kwargs,
         )
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 7c612c131a6..60fa552fd0b 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
@@ -81,12 +81,14 @@ class ComplexQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class ComplexQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 7c612c131a6..60fa552fd0b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -81,12 +81,14 @@ class ComplexQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class ComplexQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
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 4eada22cda8..692a6e2bcc3 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
@@ -107,9 +107,11 @@ class ComposedAnyOfDifferentTypesNoValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
index 4eada22cda8..692a6e2bcc3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
@@ -107,9 +107,11 @@ class ComposedAnyOfDifferentTypesNoValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
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 fd2246a6287..b521637fbc8 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
@@ -56,9 +56,11 @@ class ComposedObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
index fd2246a6287..b521637fbc8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
@@ -56,9 +56,11 @@ class ComposedObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
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 f0e4c3bfd24..2902b958580 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
@@ -52,11 +52,13 @@ class ComposedOneOfDifferentTypes(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'one_of_4':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         
@@ -121,11 +123,13 @@ class ComposedOneOfDifferentTypes(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
index 615d7608bdb..08d13d5c2c5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
@@ -50,11 +50,13 @@ class ComposedOneOfDifferentTypes(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'one_of_4':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         
@@ -112,11 +114,13 @@ class ComposedOneOfDifferentTypes(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index 56b7e253d64..7d763777331 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -76,10 +76,12 @@ class DanishPig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'DanishPig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index 56b7e253d64..7d763777331 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -76,10 +76,12 @@ class DanishPig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'DanishPig':
         return super().__new__(
             cls,
             *args,
             className=className,
             _configuration=_configuration,
+            **kwargs,
         )
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 6ff8aa26911..d89c21b148d 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
@@ -67,12 +67,14 @@ class Dog(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 breed: typing.Union[MetaOapg.properties.breed, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     breed=breed,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -96,11 +98,13 @@ class Dog(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Dog':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 6ff8aa26911..d89c21b148d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -67,12 +67,14 @@ class Dog(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 breed: typing.Union[MetaOapg.properties.breed, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     breed=breed,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -96,11 +98,13 @@ class Dog(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Dog':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
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 89cda8ad599..f5e036df4bb 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
@@ -128,6 +128,7 @@ class EnumArrays(
         just_symbol: typing.Union[MetaOapg.properties.just_symbol, str, schemas.Unset] = schemas.unset,
         array_enum: typing.Union[MetaOapg.properties.array_enum, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
@@ -135,4 +136,5 @@ class EnumArrays(
             just_symbol=just_symbol,
             array_enum=array_enum,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 89cda8ad599..f5e036df4bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -128,6 +128,7 @@ class EnumArrays(
         just_symbol: typing.Union[MetaOapg.properties.just_symbol, str, schemas.Unset] = schemas.unset,
         array_enum: typing.Union[MetaOapg.properties.array_enum, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
@@ -135,4 +136,5 @@ class EnumArrays(
             just_symbol=just_symbol,
             array_enum=array_enum,
             _configuration=_configuration,
+            **kwargs,
         )
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 1a6ff6bed51..1adec63515a 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
@@ -230,6 +230,7 @@ class EnumTest(
         IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'EnumTest':
         return super().__new__(
             cls,
@@ -244,6 +245,7 @@ class EnumTest(
             IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue,
             IntegerEnumOneValue=IntegerEnumOneValue,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.integer_enum import IntegerEnum
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index 1a6ff6bed51..1adec63515a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -230,6 +230,7 @@ class EnumTest(
         IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'EnumTest':
         return super().__new__(
             cls,
@@ -244,6 +245,7 @@ class EnumTest(
             IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue,
             IntegerEnumOneValue=IntegerEnumOneValue,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.integer_enum import IntegerEnum
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 f33b43d2735..f71f4bc846e 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
@@ -81,12 +81,14 @@ class EquilateralTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class EquilateralTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index f33b43d2735..f71f4bc846e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -81,12 +81,14 @@ class EquilateralTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class EquilateralTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 9bd2581b465..bd6c42a38a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -61,10 +61,12 @@ class File(
         *args: typing.Union[dict, frozendict.frozendict, ],
         sourceURI: typing.Union[MetaOapg.properties.sourceURI, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'File':
         return super().__new__(
             cls,
             *args,
             sourceURI=sourceURI,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 9bd2581b465..bd6c42a38a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -61,10 +61,12 @@ class File(
         *args: typing.Union[dict, frozendict.frozendict, ],
         sourceURI: typing.Union[MetaOapg.properties.sourceURI, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'File':
         return super().__new__(
             cls,
             *args,
             sourceURI=sourceURI,
             _configuration=_configuration,
+            **kwargs,
         )
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 95c17c0dcfb..21a221b9e44 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
@@ -96,6 +96,7 @@ class FileSchemaTestClass(
         file: typing.Union['File', schemas.Unset] = schemas.unset,
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
@@ -103,6 +104,7 @@ class FileSchemaTestClass(
             file=file,
             files=files,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.file import File
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 95c17c0dcfb..21a221b9e44 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -96,6 +96,7 @@ class FileSchemaTestClass(
         file: typing.Union['File', schemas.Unset] = schemas.unset,
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
@@ -103,6 +104,7 @@ class FileSchemaTestClass(
             file=file,
             files=files,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.file import File
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index 66383419f6e..c97d9b5d469 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -59,10 +59,12 @@ class Foo(
         *args: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Foo':
         return super().__new__(
             cls,
             *args,
             bar=bar,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index 66383419f6e..c97d9b5d469 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -59,10 +59,12 @@ class Foo(
         *args: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Foo':
         return super().__new__(
             cls,
             *args,
             bar=bar,
             _configuration=_configuration,
+            **kwargs,
         )
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 905f7ce6d40..be9e14d0466 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
@@ -318,6 +318,7 @@ class FormatTest(
         pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, str, schemas.Unset] = schemas.unset,
         noneProp: typing.Union[MetaOapg.properties.noneProp, None, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'FormatTest':
         return super().__new__(
             cls,
@@ -343,4 +344,5 @@ class FormatTest(
             pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter,
             noneProp=noneProp,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index aef40a2ce49..65aa068eac9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -270,6 +270,7 @@ class FormatTest(
         pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, str, schemas.Unset] = schemas.unset,
         noneProp: typing.Union[MetaOapg.properties.noneProp, None, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'FormatTest':
         return super().__new__(
             cls,
@@ -295,4 +296,5 @@ class FormatTest(
             pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter,
             noneProp=noneProp,
             _configuration=_configuration,
+            **kwargs,
         )
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 6e1a5596680..9196ceff5b6 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
@@ -76,12 +76,14 @@ class Fruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Fruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 6e1a5596680..9196ceff5b6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -76,12 +76,14 @@ class Fruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Fruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
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 097520f6d1e..57fc281b82a 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
@@ -57,11 +57,13 @@ class FruitReq(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'FruitReq':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.apple_req import AppleReq
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
index 097520f6d1e..57fc281b82a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
@@ -57,11 +57,13 @@ class FruitReq(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'FruitReq':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.apple_req import AppleReq
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 0ba9510a961..483619ba35d 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
@@ -76,12 +76,14 @@ class GmFruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'GmFruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 0ba9510a961..483619ba35d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -76,12 +76,14 @@ class GmFruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'GmFruit':
         return super().__new__(
             cls,
             *args,
             color=color,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.apple import Apple
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index 92d4f58c0d6..4a116b11098 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -72,12 +72,14 @@ class GrandparentAnimal(
         *args: typing.Union[dict, frozendict.frozendict, ],
         pet_type: typing.Union[MetaOapg.properties.pet_type, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
             *args,
             pet_type=pet_type,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index 92d4f58c0d6..4a116b11098 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -72,12 +72,14 @@ class GrandparentAnimal(
         *args: typing.Union[dict, frozendict.frozendict, ],
         pet_type: typing.Union[MetaOapg.properties.pet_type, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
             *args,
             pet_type=pet_type,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index c0ca68523d1..b3a96eeb196 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -66,6 +66,7 @@ class HasOnlyReadOnly(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
@@ -73,4 +74,5 @@ class HasOnlyReadOnly(
             bar=bar,
             foo=foo,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index c0ca68523d1..b3a96eeb196 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -66,6 +66,7 @@ class HasOnlyReadOnly(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
@@ -73,4 +74,5 @@ class HasOnlyReadOnly(
             bar=bar,
             foo=foo,
             _configuration=_configuration,
+            **kwargs,
         )
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 20d4c61d0c3..b21c3e6c715 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
@@ -81,10 +81,12 @@ class HealthCheckResult(
         *args: typing.Union[dict, frozendict.frozendict, ],
         NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
             *args,
             NullableMessage=NullableMessage,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 20d4c61d0c3..b21c3e6c715 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -81,10 +81,12 @@ class HealthCheckResult(
         *args: typing.Union[dict, frozendict.frozendict, ],
         NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
             *args,
             NullableMessage=NullableMessage,
             _configuration=_configuration,
+            **kwargs,
         )
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 ceaa43a27c1..ab839a02e10 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
@@ -81,12 +81,14 @@ class IsoscelesTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class IsoscelesTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index ceaa43a27c1..ab839a02e10 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -81,12 +81,14 @@ class IsoscelesTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class IsoscelesTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
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 9674a73adc2..aa9cb2825e5 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
@@ -67,11 +67,13 @@ class Mammal(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Mammal':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.pig import Pig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
index 9674a73adc2..aa9cb2825e5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
@@ -67,11 +67,13 @@ class Mammal(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Mammal':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.pig import Pig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index c91d7239b62..6b82a5c0dd5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -224,6 +224,7 @@ class MapTest(
         direct_map: typing.Union[MetaOapg.properties.direct_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['StringBooleanMap', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'MapTest':
         return super().__new__(
             cls,
@@ -233,6 +234,7 @@ class MapTest(
             direct_map=direct_map,
             indirect_map=indirect_map,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.string_boolean_map import StringBooleanMap
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index c91d7239b62..6b82a5c0dd5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -224,6 +224,7 @@ class MapTest(
         direct_map: typing.Union[MetaOapg.properties.direct_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['StringBooleanMap', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'MapTest':
         return super().__new__(
             cls,
@@ -233,6 +234,7 @@ class MapTest(
             direct_map=direct_map,
             indirect_map=indirect_map,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.string_boolean_map import StringBooleanMap
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index 29b9a9791cd..bf7215d11ad 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -107,6 +107,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         dateTime: typing.Union[MetaOapg.properties.dateTime, datetime, str, schemas.Unset] = schemas.unset,
         map: typing.Union[MetaOapg.properties.map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -115,6 +116,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             dateTime=dateTime,
             map=map,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index 29b9a9791cd..bf7215d11ad 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -107,6 +107,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         dateTime: typing.Union[MetaOapg.properties.dateTime, datetime, str, schemas.Unset] = schemas.unset,
         map: typing.Union[MetaOapg.properties.map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
@@ -115,6 +116,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             dateTime=dateTime,
             map=map,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.animal import Animal
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 e34f80a8361..a6aee4d8a18 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
@@ -67,10 +67,12 @@ class Model200Response(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         name: typing.Union[MetaOapg.properties.name, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Model200Response':
         return super().__new__(
             cls,
             *args,
             name=name,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index e34f80a8361..a6aee4d8a18 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -67,10 +67,12 @@ class Model200Response(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         name: typing.Union[MetaOapg.properties.name, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Model200Response':
         return super().__new__(
             cls,
             *args,
             name=name,
             _configuration=_configuration,
+            **kwargs,
         )
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 021e54f6570..e0cde77414d 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
@@ -60,9 +60,11 @@ class ModelReturn(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ModelReturn':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index 021e54f6570..e0cde77414d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -60,9 +60,11 @@ class ModelReturn(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ModelReturn':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 75f6eff7623..412ef6780f2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -74,6 +74,7 @@ class Money(
         amount: typing.Union[MetaOapg.properties.amount, str, ],
         currency: 'Currency',
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Money':
         return super().__new__(
             cls,
@@ -81,6 +82,7 @@ class Money(
             amount=amount,
             currency=currency,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.currency import Currency
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 75f6eff7623..412ef6780f2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -74,6 +74,7 @@ class Money(
         amount: typing.Union[MetaOapg.properties.amount, str, ],
         currency: 'Currency',
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Money':
         return super().__new__(
             cls,
@@ -81,6 +82,7 @@ class Money(
             amount=amount,
             currency=currency,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.currency import Currency
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 5c1e6089873..710ce877a3d 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
@@ -77,6 +77,7 @@ class Name(
         name: typing.Union[MetaOapg.properties.name, int, ],
         snake_case: typing.Union[MetaOapg.properties.snake_case, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Name':
         return super().__new__(
             cls,
@@ -84,4 +85,5 @@ class Name(
             name=name,
             snake_case=snake_case,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 5c1e6089873..710ce877a3d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -77,6 +77,7 @@ class Name(
         name: typing.Union[MetaOapg.properties.name, int, ],
         snake_case: typing.Union[MetaOapg.properties.snake_case, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Name':
         return super().__new__(
             cls,
@@ -84,4 +85,5 @@ class Name(
             name=name,
             snake_case=snake_case,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 905e3fe3f73..16f15162217 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -72,7 +72,6 @@ class NoAdditionalProperties(
         id: typing.Union[MetaOapg.properties.id, int, ],
         petId: typing.Union[MetaOapg.properties.petId, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NoAdditionalProperties':
         return super().__new__(
             cls,
@@ -80,5 +79,4 @@ class NoAdditionalProperties(
             id=id,
             petId=petId,
             _configuration=_configuration,
-            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 905e3fe3f73..16f15162217 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -72,7 +72,6 @@ class NoAdditionalProperties(
         id: typing.Union[MetaOapg.properties.id, int, ],
         petId: typing.Union[MetaOapg.properties.petId, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
     ) -> 'NoAdditionalProperties':
         return super().__new__(
             cls,
@@ -80,5 +79,4 @@ class NoAdditionalProperties(
             id=id,
             petId=petId,
             _configuration=_configuration,
-            **kwargs,
         )
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 59f91d3791e..dcfcf412a8d 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
@@ -208,18 +208,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'items':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
             
             
@@ -252,18 +251,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'items':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
             
                 def __new__(
@@ -338,18 +336,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
             
                 
@@ -393,18 +390,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
@@ -453,18 +449,17 @@ class NullableClass(
         ):
         
         
-            class MetaOapg:
-        
-        
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'additional_properties':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
+                    **kwargs,
                 )
     
     integer_prop: typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index 59f91d3791e..dcfcf412a8d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -208,18 +208,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'items':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
             
             
@@ -252,18 +251,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'items':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
             
                 def __new__(
@@ -338,18 +336,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
             
                 
@@ -393,18 +390,17 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
-                    
-                    
                         def __new__(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
+                            **kwargs,
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
                                 *args,
                                 _configuration=_configuration,
+                                **kwargs,
                             )
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
@@ -453,18 +449,17 @@ class NullableClass(
         ):
         
         
-            class MetaOapg:
-        
-        
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'additional_properties':
                 return super().__new__(
                     cls,
                     *args,
                     _configuration=_configuration,
+                    **kwargs,
                 )
     
     integer_prop: typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]
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 6b4d8e6cb9c..a66530b1ac0 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
@@ -59,11 +59,13 @@ class NullableShape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'NullableShape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
index 6b4d8e6cb9c..a66530b1ac0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
@@ -59,11 +59,13 @@ class NullableShape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'NullableShape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index baff47e6cc5..9fb146bc886 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -59,10 +59,12 @@ class NumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         JustNumber: typing.Union[MetaOapg.properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
             *args,
             JustNumber=JustNumber,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index baff47e6cc5..9fb146bc886 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -59,10 +59,12 @@ class NumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         JustNumber: typing.Union[MetaOapg.properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
             *args,
             JustNumber=JustNumber,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index ffa697dc48e..ccb00bc9537 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -79,6 +79,7 @@ class ObjectModelWithRefProps(
         myString: typing.Union[MetaOapg.properties.myString, str, schemas.Unset] = schemas.unset,
         myBoolean: typing.Union[MetaOapg.properties.myBoolean, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
@@ -87,6 +88,7 @@ class ObjectModelWithRefProps(
             myString=myString,
             myBoolean=myBoolean,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.number_with_validations import NumberWithValidations
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index ffa697dc48e..ccb00bc9537 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -79,6 +79,7 @@ class ObjectModelWithRefProps(
         myString: typing.Union[MetaOapg.properties.myString, str, schemas.Unset] = schemas.unset,
         myBoolean: typing.Union[MetaOapg.properties.myBoolean, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
@@ -87,6 +88,7 @@ class ObjectModelWithRefProps(
             myString=myString,
             myBoolean=myBoolean,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.number_with_validations import NumberWithValidations
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index 8fbf7606554..ff341c4e8d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -77,6 +77,7 @@ class ObjectWithDecimalProperties(
         width: typing.Union[MetaOapg.properties.width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['Money', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
@@ -85,6 +86,7 @@ class ObjectWithDecimalProperties(
             width=width,
             cost=cost,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.money import Money
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index 8fbf7606554..ff341c4e8d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -77,6 +77,7 @@ class ObjectWithDecimalProperties(
         width: typing.Union[MetaOapg.properties.width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['Money', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
@@ -85,6 +86,7 @@ class ObjectWithDecimalProperties(
             width=width,
             cost=cost,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.money import Money
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index 0391e75492a..408e2c94cee 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -72,9 +72,11 @@ class ObjectWithDifficultlyNamedProps(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index 0391e75492a..408e2c94cee 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -72,9 +72,11 @@ class ObjectWithDifficultlyNamedProps(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
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 fe5b30a15f6..13401d619dc 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
@@ -72,11 +72,13 @@ class ObjectWithInlineCompositionProperty(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -102,10 +104,12 @@ class ObjectWithInlineCompositionProperty(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 2e91be8b279..9e2b4116f7f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -69,11 +69,13 @@ class ObjectWithInlineCompositionProperty(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -99,10 +101,12 @@ class ObjectWithInlineCompositionProperty(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
index e5e11b10cb1..4aee2ba04a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
@@ -39,9 +39,11 @@ class ObjectWithValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
index 6ce555c9c97..106950e9092 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
@@ -38,9 +38,11 @@ class ObjectWithValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index 1cc2960508f..395251fe828 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -120,6 +120,7 @@ class Order(
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         complete: typing.Union[MetaOapg.properties.complete, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Order':
         return super().__new__(
             cls,
@@ -131,4 +132,5 @@ class Order(
             status=status,
             complete=complete,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index 1cc2960508f..395251fe828 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -120,6 +120,7 @@ class Order(
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         complete: typing.Union[MetaOapg.properties.complete, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Order':
         return super().__new__(
             cls,
@@ -131,4 +132,5 @@ class Order(
             status=status,
             complete=complete,
             _configuration=_configuration,
+            **kwargs,
         )
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 0cf4bd27e3a..b704664323b 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
@@ -64,11 +64,13 @@ class ParentPet(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ParentPet':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
index 0cf4bd27e3a..b704664323b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
@@ -64,11 +64,13 @@ class ParentPet(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ParentPet':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.child_cat import ChildCat
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 ae6ec8abfb1..c98de5fd22d 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
@@ -178,6 +178,7 @@ class Pet(
         tags: typing.Union[MetaOapg.properties.tags, tuple, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Pet':
         return super().__new__(
             cls,
@@ -189,6 +190,7 @@ class Pet(
             tags=tags,
             status=status,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.category import Category
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index ae6ec8abfb1..c98de5fd22d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -178,6 +178,7 @@ class Pet(
         tags: typing.Union[MetaOapg.properties.tags, tuple, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Pet':
         return super().__new__(
             cls,
@@ -189,6 +190,7 @@ class Pet(
             tags=tags,
             status=status,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.category import Category
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 0206d074150..4bfaedcac41 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
@@ -65,11 +65,13 @@ class Pig(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Pig':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.basque_pig import BasquePig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
index 0206d074150..4bfaedcac41 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
@@ -65,11 +65,13 @@ class Pig(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Pig':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.basque_pig import BasquePig
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 3cd05b0e093..8b134286a60 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -72,6 +72,7 @@ class Player(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Player':
         return super().__new__(
             cls,
@@ -79,4 +80,5 @@ class Player(
             name=name,
             enemyPlayer=enemyPlayer,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 3cd05b0e093..8b134286a60 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -72,6 +72,7 @@ class Player(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Player':
         return super().__new__(
             cls,
@@ -79,4 +80,5 @@ class Player(
             name=name,
             enemyPlayer=enemyPlayer,
             _configuration=_configuration,
+            **kwargs,
         )
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 3a160dc1c7b..0f97215e018 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
@@ -65,11 +65,13 @@ class Quadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.complex_quadrilateral import ComplexQuadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
index 3a160dc1c7b..0f97215e018 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
@@ -65,11 +65,13 @@ class Quadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.complex_quadrilateral import ComplexQuadrilateral
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 1a9acecfd8f..7fbadc1a3f3 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
@@ -85,6 +85,7 @@ class QuadrilateralInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
@@ -92,4 +93,5 @@ class QuadrilateralInterface(
             shapeType=shapeType,
             quadrilateralType=quadrilateralType,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 1a9acecfd8f..7fbadc1a3f3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -85,6 +85,7 @@ class QuadrilateralInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
@@ -92,4 +93,5 @@ class QuadrilateralInterface(
             shapeType=shapeType,
             quadrilateralType=quadrilateralType,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index 9a98dda9e12..36b3853dc6b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -66,6 +66,7 @@ class ReadOnlyFirst(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         baz: typing.Union[MetaOapg.properties.baz, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
@@ -73,4 +74,5 @@ class ReadOnlyFirst(
             bar=bar,
             baz=baz,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index 9a98dda9e12..36b3853dc6b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -66,6 +66,7 @@ class ReadOnlyFirst(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         baz: typing.Union[MetaOapg.properties.baz, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
@@ -73,4 +74,5 @@ class ReadOnlyFirst(
             bar=bar,
             baz=baz,
             _configuration=_configuration,
+            **kwargs,
         )
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 3e1d8df82d7..d6abad56b59 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
@@ -81,12 +81,14 @@ class ScaleneTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class ScaleneTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 3e1d8df82d7..d6abad56b59 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -81,12 +81,14 @@ class ScaleneTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     triangleType=triangleType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class ScaleneTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.triangle_interface import TriangleInterface
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 5685b1ccd75..877013b205f 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
@@ -65,11 +65,13 @@ class Shape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Shape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
index 5685b1ccd75..877013b205f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
@@ -65,11 +65,13 @@ class Shape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Shape':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
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 1c5b48d3227..68d87005875 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
@@ -69,11 +69,13 @@ class ShapeOrNull(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
index 1c5b48d3227..68d87005875 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
@@ -69,11 +69,13 @@ class ShapeOrNull(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral import Quadrilateral
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 feec64cd857..a732fe6ef66 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
@@ -81,12 +81,14 @@ class SimpleQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class SimpleQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index feec64cd857..a732fe6ef66 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -81,12 +81,14 @@ class SimpleQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
+                **kwargs,
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
                     *args,
                     quadrilateralType=quadrilateralType,
                     _configuration=_configuration,
+                    **kwargs,
                 )
         
         @classmethod
@@ -110,11 +112,13 @@ class SimpleQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
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 3af464e9c81..7680d810446 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
@@ -54,11 +54,13 @@ class SomeObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SomeObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.object_interface import ObjectInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
index 3af464e9c81..7680d810446 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
@@ -54,11 +54,13 @@ class SomeObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SomeObject':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.object_interface import ObjectInterface
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 1480e04f3f7..808997801fb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -61,10 +61,12 @@ class SpecialModelName(
         *args: typing.Union[dict, frozendict.frozendict, ],
         a: typing.Union[MetaOapg.properties.a, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
             *args,
             a=a,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 1480e04f3f7..808997801fb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -61,10 +61,12 @@ class SpecialModelName(
         *args: typing.Union[dict, frozendict.frozendict, ],
         a: typing.Union[MetaOapg.properties.a, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
             *args,
             a=a,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index ca733d17a03..9c978473f92 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -66,6 +66,7 @@ class Tag(
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Tag':
         return super().__new__(
             cls,
@@ -73,4 +74,5 @@ class Tag(
             id=id,
             name=name,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index ca733d17a03..9c978473f92 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -66,6 +66,7 @@ class Tag(
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Tag':
         return super().__new__(
             cls,
@@ -73,4 +74,5 @@ class Tag(
             id=id,
             name=name,
             _configuration=_configuration,
+            **kwargs,
         )
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 28540914172..5cc130e6564 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
@@ -67,11 +67,13 @@ class Triangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Triangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.equilateral_triangle import EquilateralTriangle
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
index 28540914172..5cc130e6564 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
@@ -67,11 +67,13 @@ class Triangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Triangle':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 from petstore_api.model.equilateral_triangle import EquilateralTriangle
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 70a5bf16dc4..a6d8196a0e4 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
@@ -85,6 +85,7 @@ class TriangleInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         triangleType: typing.Union[MetaOapg.properties.triangleType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
@@ -92,4 +93,5 @@ class TriangleInterface(
             shapeType=shapeType,
             triangleType=triangleType,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index 70a5bf16dc4..a6d8196a0e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -85,6 +85,7 @@ class TriangleInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         triangleType: typing.Union[MetaOapg.properties.triangleType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
@@ -92,4 +93,5 @@ class TriangleInterface(
             shapeType=shapeType,
             triangleType=triangleType,
             _configuration=_configuration,
+            **kwargs,
         )
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 f616afd04ca..c52f5e72f38 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
@@ -54,18 +54,17 @@ class User(
             ):
             
             
-                class MetaOapg:
-            
-            
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, None, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'objectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             anyTypeProp = schemas.AnyTypeSchema
             
@@ -83,11 +82,13 @@ class User(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'anyTypeExceptNullProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             anyTypePropNullable = schemas.AnyTypeSchema
             __annotations__ = {
@@ -186,6 +187,7 @@ class User(
         anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'User':
         return super().__new__(
             cls,
@@ -204,4 +206,5 @@ class User(
             anyTypeExceptNullProp=anyTypeExceptNullProp,
             anyTypePropNullable=anyTypePropNullable,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index f616afd04ca..c52f5e72f38 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -54,18 +54,17 @@ class User(
             ):
             
             
-                class MetaOapg:
-            
-            
                 def __new__(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, None, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'objectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             anyTypeProp = schemas.AnyTypeSchema
             
@@ -83,11 +82,13 @@ class User(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'anyTypeExceptNullProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             anyTypePropNullable = schemas.AnyTypeSchema
             __annotations__ = {
@@ -186,6 +187,7 @@ class User(
         anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'User':
         return super().__new__(
             cls,
@@ -204,4 +206,5 @@ class User(
             anyTypeExceptNullProp=anyTypeExceptNullProp,
             anyTypePropNullable=anyTypePropNullable,
             _configuration=_configuration,
+            **kwargs,
         )
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 bd673e7263c..acce1a7a8f9 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
@@ -90,6 +90,7 @@ class Whale(
         hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, bool, schemas.Unset] = schemas.unset,
         hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Whale':
         return super().__new__(
             cls,
@@ -98,4 +99,5 @@ class Whale(
             hasBaleen=hasBaleen,
             hasTeeth=hasTeeth,
             _configuration=_configuration,
+            **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index bd673e7263c..acce1a7a8f9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -90,6 +90,7 @@ class Whale(
         hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, bool, schemas.Unset] = schemas.unset,
         hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'Whale':
         return super().__new__(
             cls,
@@ -98,4 +99,5 @@ class Whale(
             hasBaleen=hasBaleen,
             hasTeeth=hasTeeth,
             _configuration=_configuration,
+            **kwargs,
         )
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 90e6b56f604..2b079761dba 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
@@ -231,6 +231,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         password: typing.Union[MetaOapg.properties.password, str, schemas.Unset] = schemas.unset,
         callback: typing.Union[MetaOapg.properties.callback, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -249,6 +250,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             password=password,
             callback=callback,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index 8b8a5415f27..1f4eefca537 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -193,6 +193,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         password: typing.Union[MetaOapg.properties.password, str, schemas.Unset] = schemas.unset,
         callback: typing.Union[MetaOapg.properties.callback, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -211,6 +212,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             password=password,
             callback=callback,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
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 1dd2a5894e4..05985974b11 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
@@ -393,6 +393,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, tuple, schemas.Unset] = schemas.unset,
         enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -400,6 +401,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             enum_form_string_array=enum_form_string_array,
             enum_form_string=enum_form_string,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 92a5460f431..f2dd26e36e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -317,6 +317,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, tuple, schemas.Unset] = schemas.unset,
         enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -324,6 +325,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             enum_form_string_array=enum_form_string_array,
             enum_form_string=enum_form_string,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
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 95c8cda96af..85ba7127f9a 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
@@ -64,11 +64,13 @@ class CompositionAtRootSchema(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'CompositionAtRootSchema':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -117,11 +119,13 @@ class CompositionInPropertySchema(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -147,12 +151,14 @@ class CompositionInPropertySchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'CompositionInPropertySchema':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
 RequestRequiredQueryParams = typing.TypedDict(
     'RequestRequiredQueryParams',
@@ -224,11 +230,13 @@ class SchemaForRequestBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -277,11 +285,13 @@ class SchemaForRequestBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -307,12 +317,14 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -362,11 +374,13 @@ class SchemaFor200ResponseBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -415,11 +429,13 @@ class SchemaFor200ResponseBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -445,12 +461,14 @@ class SchemaFor200ResponseBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaFor200ResponseBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 0c0eae356f4..a068820b775 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -59,11 +59,13 @@ class CompositionAtRootSchema(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'CompositionAtRootSchema':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -109,11 +111,13 @@ class CompositionInPropertySchema(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -139,12 +143,14 @@ class CompositionInPropertySchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'CompositionInPropertySchema':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
 # body param
 
@@ -182,11 +188,13 @@ class SchemaForRequestBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -232,11 +240,13 @@ class SchemaForRequestBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -262,12 +272,14 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -304,11 +316,13 @@ class SchemaFor200ResponseBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
@@ -354,11 +368,13 @@ class SchemaFor200ResponseBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
+                    **kwargs,
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
                         *args,
                         _configuration=_configuration,
+                        **kwargs,
                     )
             __annotations__ = {
                 "someProp": someProp,
@@ -384,12 +400,14 @@ class SchemaFor200ResponseBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaFor200ResponseBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             someProp=someProp,
             _configuration=_configuration,
+            **kwargs,
         )
 _all_accept_content_types = (
     'application/json',
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index e10b2b3d808..fea3a14cbe4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -71,6 +71,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         param: typing.Union[MetaOapg.properties.param, str, ],
         param2: typing.Union[MetaOapg.properties.param2, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -78,6 +79,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             param=param,
             param2=param2,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 0cfa17a12f1..eb2d3df1d66 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -69,6 +69,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         param: typing.Union[MetaOapg.properties.param, str, ],
         param2: typing.Union[MetaOapg.properties.param2, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -76,6 +77,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             param=param,
             param2=param2,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index 5c8cb3f0d0c..dfeba050cb1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -59,12 +59,14 @@ class MapBeanSchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         keyword: typing.Union[MetaOapg.properties.keyword, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'MapBeanSchema':
         return super().__new__(
             cls,
             *args,
             keyword=keyword,
             _configuration=_configuration,
+            **kwargs,
         )
 RequestRequiredQueryParams = typing.TypedDict(
     'RequestRequiredQueryParams',
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index d09a9336c90..081a917302c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -57,12 +57,14 @@ class MapBeanSchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         keyword: typing.Union[MetaOapg.properties.keyword, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'MapBeanSchema':
         return super().__new__(
             cls,
             *args,
             keyword=keyword,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
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 85155109ccb..05fa24e67ee 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
@@ -98,6 +98,7 @@ class SchemaForRequestBodyMultipartFormData(
         requiredFile: typing.Union[MetaOapg.properties.requiredFile, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -105,6 +106,7 @@ class SchemaForRequestBodyMultipartFormData(
             requiredFile=requiredFile,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index 8525427306d..f025f0560d8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -72,6 +72,7 @@ class SchemaForRequestBodyMultipartFormData(
         requiredFile: typing.Union[MetaOapg.properties.requiredFile, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -79,6 +80,7 @@ class SchemaForRequestBodyMultipartFormData(
             requiredFile=requiredFile,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
+            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
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 295ac84382e..bc9f732d707 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
@@ -72,6 +72,7 @@ class SchemaForRequestBodyMultipartFormData(
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -79,6 +80,7 @@ class SchemaForRequestBodyMultipartFormData(
             file=file,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index d1211a83dc6..c508da08fc5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -70,6 +70,7 @@ class SchemaForRequestBodyMultipartFormData(
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -77,6 +78,7 @@ class SchemaForRequestBodyMultipartFormData(
             file=file,
             additionalMetadata=additionalMetadata,
             _configuration=_configuration,
+            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
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 cfa29cd44ef..5914b8fb171 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
@@ -84,12 +84,14 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             files=files,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index a61db7ceae1..3b50edbdd61 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -82,12 +82,14 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
             *args,
             files=files,
             _configuration=_configuration,
+            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index dcd5750a4a9..9b69a953340 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -65,12 +65,14 @@ class SchemaFor0ResponseBodyApplicationJson(
         *args: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['Foo', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaFor0ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             string=string,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index a15054839fa..f53d8e90263 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -63,12 +63,14 @@ class SchemaFor0ResponseBodyApplicationJson(
         *args: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['Foo', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaFor0ResponseBodyApplicationJson':
         return super().__new__(
             cls,
             *args,
             string=string,
             _configuration=_configuration,
+            **kwargs,
         )
 _all_accept_content_types = (
     'application/json',
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index 76a240ef76e..d6644cd9d20 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -93,6 +93,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -100,6 +101,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             name=name,
             status=status,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index 776c1abe30a..543448b6501 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -67,6 +67,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
@@ -74,6 +75,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
             name=name,
             status=status,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 1d83c491f2a..a7f6f1ae0e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -95,6 +95,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -102,6 +103,7 @@ class SchemaForRequestBodyMultipartFormData(
             additionalMetadata=additionalMetadata,
             file=file,
             _configuration=_configuration,
+            **kwargs,
         )
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 5fc0a77f61f..e1ebbc18757 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -69,6 +69,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs,
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -76,6 +77,7 @@ class SchemaForRequestBodyMultipartFormData(
             additionalMetadata=additionalMetadata,
             file=file,
             _configuration=_configuration,
+            **kwargs,
         )
 SchemaFor200ResponseBodyApplicationJson = ApiResponse
 _all_accept_content_types = (
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 eb442a3f52f..8b176df7993 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -2152,7 +2152,7 @@ class AnyTypeSchema(
 
 
 class NotAnyTypeSchema(
-    schemas.ComposedSchema,
+    ComposedSchema,
 ):
     """
     Does not allow inputs in of AnyType
@@ -2160,13 +2160,13 @@ class NotAnyTypeSchema(
     """
 
     class MetaOapg:
-        not_schema = schemas.AnyTypeSchema
+        not_schema = AnyTypeSchema
 
     def __new__(
         cls,
         *args,
-        _configuration: typing.Optional[schemas.Configuration] = None,
-    ) > 'NotAnyTypeSchema':
+        _configuration: typing.Optional[Configuration] = None,
+    ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
             *args,
-- 
GitLab


From 15ceb8d528c6bae58e91d91d8b188d9bfa6f387f Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 13:48:58 -0700
Subject: [PATCH 13/30] Updates get_item type hints

---
 ...property_getitems_with_addprops.handlebars | 22 ++++++++++---------
 ..._getitems_with_addprops_getitem.handlebars |  8 +++++++
 ...perty_getitems_without_addprops.handlebars |  5 ++++-
 .../model/additional_properties_class.py      | 14 ++++--------
 .../model/additional_properties_class.pyi     | 14 ++++--------
 .../petstore_api/model/animal.py              |  5 ++++-
 .../petstore_api/model/animal.pyi             |  5 ++++-
 .../petstore_api/model/api_response.py        |  5 ++++-
 .../petstore_api/model/api_response.pyi       |  5 ++++-
 .../petstore_api/model/apple.py               |  5 ++++-
 .../petstore_api/model/apple.pyi              |  5 ++++-
 .../petstore_api/model/apple_req.py           |  5 +----
 .../petstore_api/model/apple_req.pyi          |  5 +----
 .../model/array_of_array_of_number_only.py    |  5 ++++-
 .../model/array_of_array_of_number_only.pyi   |  5 ++++-
 .../model/array_of_number_only.py             |  5 ++++-
 .../model/array_of_number_only.pyi            |  5 ++++-
 .../petstore_api/model/array_test.py          |  5 ++++-
 .../petstore_api/model/array_test.pyi         |  5 ++++-
 .../petstore_api/model/banana.py              |  5 ++++-
 .../petstore_api/model/banana.pyi             |  5 ++++-
 .../petstore_api/model/banana_req.py          |  5 +----
 .../petstore_api/model/banana_req.pyi         |  5 +----
 .../petstore_api/model/basque_pig.py          |  5 ++++-
 .../petstore_api/model/basque_pig.pyi         |  5 ++++-
 .../petstore_api/model/capitalization.py      |  5 ++++-
 .../petstore_api/model/capitalization.pyi     |  5 ++++-
 .../petstore_api/model/cat.py                 |  5 ++++-
 .../petstore_api/model/cat.pyi                |  5 ++++-
 .../petstore_api/model/category.py            |  5 ++++-
 .../petstore_api/model/category.pyi           |  5 ++++-
 .../petstore_api/model/child_cat.py           |  5 ++++-
 .../petstore_api/model/child_cat.pyi          |  5 ++++-
 .../petstore_api/model/class_model.py         |  5 ++++-
 .../petstore_api/model/class_model.pyi        |  5 ++++-
 .../petstore_api/model/client.py              |  5 ++++-
 .../petstore_api/model/client.pyi             |  5 ++++-
 .../model/complex_quadrilateral.py            |  5 ++++-
 .../model/complex_quadrilateral.pyi           |  5 ++++-
 .../petstore_api/model/danish_pig.py          |  5 ++++-
 .../petstore_api/model/danish_pig.pyi         |  5 ++++-
 .../petstore_api/model/dog.py                 |  5 ++++-
 .../petstore_api/model/dog.pyi                |  5 ++++-
 .../petstore_api/model/drawing.py             |  2 +-
 .../petstore_api/model/drawing.pyi            |  2 +-
 .../petstore_api/model/enum_arrays.py         |  5 ++++-
 .../petstore_api/model/enum_arrays.pyi        |  5 ++++-
 .../petstore_api/model/enum_test.py           |  5 ++++-
 .../petstore_api/model/enum_test.pyi          |  5 ++++-
 .../model/equilateral_triangle.py             |  5 ++++-
 .../model/equilateral_triangle.pyi            |  5 ++++-
 .../petstore_api/model/file.py                |  5 ++++-
 .../petstore_api/model/file.pyi               |  5 ++++-
 .../model/file_schema_test_class.py           |  5 ++++-
 .../model/file_schema_test_class.pyi          |  5 ++++-
 .../petstore_api/model/foo.py                 |  5 ++++-
 .../petstore_api/model/foo.pyi                |  5 ++++-
 .../petstore_api/model/format_test.py         |  5 ++++-
 .../petstore_api/model/format_test.pyi        |  5 ++++-
 .../petstore_api/model/fruit.py               |  5 ++++-
 .../petstore_api/model/fruit.pyi              |  5 ++++-
 .../petstore_api/model/gm_fruit.py            |  5 ++++-
 .../petstore_api/model/gm_fruit.pyi           |  5 ++++-
 .../petstore_api/model/grandparent_animal.py  |  5 ++++-
 .../petstore_api/model/grandparent_animal.pyi |  5 ++++-
 .../petstore_api/model/has_only_read_only.py  |  5 ++++-
 .../petstore_api/model/has_only_read_only.pyi |  5 ++++-
 .../petstore_api/model/health_check_result.py |  5 ++++-
 .../model/health_check_result.pyi             |  5 ++++-
 .../petstore_api/model/isosceles_triangle.py  |  5 ++++-
 .../petstore_api/model/isosceles_triangle.pyi |  5 ++++-
 .../petstore_api/model/map_test.py            |  5 ++++-
 .../petstore_api/model/map_test.pyi           |  5 ++++-
 ...perties_and_additional_properties_class.py |  5 ++++-
 ...erties_and_additional_properties_class.pyi |  5 ++++-
 .../petstore_api/model/model200_response.py   |  5 ++++-
 .../petstore_api/model/model200_response.pyi  |  5 ++++-
 .../petstore_api/model/model_return.py        |  5 ++++-
 .../petstore_api/model/model_return.pyi       |  5 ++++-
 .../petstore_api/model/money.py               |  5 ++++-
 .../petstore_api/model/money.pyi              |  5 ++++-
 .../petstore_api/model/name.py                |  5 ++++-
 .../petstore_api/model/name.pyi               |  5 ++++-
 .../model/no_additional_properties.py         |  5 +----
 .../model/no_additional_properties.pyi        |  5 +----
 .../petstore_api/model/nullable_class.py      |  2 +-
 .../petstore_api/model/nullable_class.pyi     |  2 +-
 .../petstore_api/model/number_only.py         |  5 ++++-
 .../petstore_api/model/number_only.pyi        |  5 ++++-
 .../model/object_model_with_ref_props.py      |  5 ++++-
 .../model/object_model_with_ref_props.pyi     |  5 ++++-
 .../model/object_with_decimal_properties.py   |  5 ++++-
 .../model/object_with_decimal_properties.pyi  |  5 ++++-
 .../object_with_difficultly_named_props.py    |  5 ++++-
 .../object_with_difficultly_named_props.pyi   |  5 ++++-
 ...object_with_inline_composition_property.py |  5 ++++-
 ...bject_with_inline_composition_property.pyi |  5 ++++-
 .../petstore_api/model/order.py               |  5 ++++-
 .../petstore_api/model/order.pyi              |  5 ++++-
 .../petstore_api/model/pet.py                 |  5 ++++-
 .../petstore_api/model/pet.pyi                |  5 ++++-
 .../petstore_api/model/player.py              |  5 ++++-
 .../petstore_api/model/player.pyi             |  5 ++++-
 .../model/quadrilateral_interface.py          |  5 ++++-
 .../model/quadrilateral_interface.pyi         |  5 ++++-
 .../petstore_api/model/read_only_first.py     |  5 ++++-
 .../petstore_api/model/read_only_first.pyi    |  5 ++++-
 .../petstore_api/model/scalene_triangle.py    |  5 ++++-
 .../petstore_api/model/scalene_triangle.pyi   |  5 ++++-
 .../model/simple_quadrilateral.py             |  5 ++++-
 .../model/simple_quadrilateral.pyi            |  5 ++++-
 .../petstore_api/model/special_model_name.py  |  5 ++++-
 .../petstore_api/model/special_model_name.pyi |  5 ++++-
 .../petstore_api/model/tag.py                 |  5 ++++-
 .../petstore_api/model/tag.pyi                |  5 ++++-
 .../petstore_api/model/triangle_interface.py  |  5 ++++-
 .../petstore_api/model/triangle_interface.pyi |  5 ++++-
 .../petstore_api/model/user.py                |  5 ++++-
 .../petstore_api/model/user.pyi               |  5 ++++-
 .../petstore_api/model/whale.py               |  5 ++++-
 .../petstore_api/model/whale.pyi              |  5 ++++-
 .../petstore_api/model/zebra.py               |  2 +-
 .../petstore_api/model/zebra.pyi              |  2 +-
 .../petstore_api/paths/fake_1/post.py         |  5 ++++-
 .../petstore_api/paths/fake_1/post.pyi        |  5 ++++-
 .../petstore_api/paths/fake_2/get.py          |  5 ++++-
 .../petstore_api/paths/fake_2/get.pyi         |  5 ++++-
 .../paths/fake_inline_composition_/post.py    | 15 ++++++++++---
 .../paths/fake_inline_composition_/post.pyi   | 15 ++++++++++---
 .../paths/fake_json_form_data/get.py          |  5 ++++-
 .../paths/fake_json_form_data/get.pyi         |  5 ++++-
 .../paths/fake_obj_in_query/get.py            |  5 ++++-
 .../paths/fake_obj_in_query/get.pyi           |  5 ++++-
 .../post.py                                   |  5 ++++-
 .../post.pyi                                  |  5 ++++-
 .../paths/fake_upload_file/post.py            |  5 ++++-
 .../paths/fake_upload_file/post.pyi           |  5 ++++-
 .../paths/fake_upload_files/post.py           |  5 ++++-
 .../paths/fake_upload_files/post.pyi          |  5 ++++-
 .../petstore_api/paths/foo/get.py             |  5 ++++-
 .../petstore_api/paths/foo/get.pyi            |  5 ++++-
 .../petstore_api/paths/pet_pet_id_3/post.py   |  5 ++++-
 .../petstore_api/paths/pet_pet_id_3/post.pyi  |  5 ++++-
 .../paths/pet_pet_id_upload_image/post.py     |  5 ++++-
 .../paths/pet_pet_id_upload_image/post.pyi    |  5 ++++-
 145 files changed, 572 insertions(+), 193 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
index 941113953a5..388b9b10f5c 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
@@ -37,16 +37,18 @@ def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[Me
 {{/each}}
 {{/if}}
 {{#or vars getRequiredVarsMap}}
+{{#with additionalProperties}}
+{{#unless getIsBooleanSchemaFalse}}
 
 @typing.overload
-def __getitem__(self, name: str) -> {{#with additionalProperties}}typing.Union[{{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}, schemas.Unset]{{/with}}: ...
-{{/or}}
+def __getitem__(self, name: str) -> typing.Union[{{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}, schemas.Unset]: ...
+{{/unless}}
+{{/with}}
+
+{{> model_templates/property_getitems_with_addprops_getitem }}
+{{else}}
+{{#not additionalProperties.getIsBooleanSchemaFalse}}
 
-def __getitem__(self, name: typing.Union[str, {{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}]){{#not vars}}{{#not getRequiredVarsMap}} -> {{#with additionalProperties}}{{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/with}}{{/not}}{{/not}}:
-    # dict_instance[name] accessor
-    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-        return super().__getitem__(name)
-    try:
-        return super().__getitem__(name)
-    except KeyError:
-        return schemas.unset
+{{> model_templates/property_getitems_with_addprops_getitem }}
+{{/not}}
+{{/or}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
new file mode 100644
index 00000000000..17e1e8b85ee
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
@@ -0,0 +1,8 @@
+def __getitem__(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
+    # dict_instance[name] accessor
+    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+        return super().__getitem__(name)
+    try:
+        return super().__getitem__(name)
+    except KeyError:
+        return schemas.unset
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
index 14169003593..780bba95d58 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
@@ -13,7 +13,10 @@ def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless requi
 {{/if}}
 {{/each}}
 
-def __getitem__(self, name: typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}]):
+@typing.overload
+def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+
+def __getitem__(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
     # dict_instance[name] accessor
     if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
         return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index a74e323367e..2778e0190e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -169,15 +169,6 @@ class AdditionalPropertiesClass(
             
                 class MetaOapg:
                     additional_properties = schemas.NotAnyTypeSchema
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
@@ -264,7 +255,10 @@ class AdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index a74e323367e..2778e0190e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -169,15 +169,6 @@ class AdditionalPropertiesClass(
             
                 class MetaOapg:
                     additional_properties = schemas.NotAnyTypeSchema
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
             
                 def __new__(
                     cls,
@@ -264,7 +255,10 @@ class AdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 8e91168967e..59cc9432ce2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -63,7 +63,10 @@ class Animal(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["className", "color", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 8e91168967e..59cc9432ce2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -63,7 +63,10 @@ class Animal(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["className", "color", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 805be04364f..5ff3b00e886 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -56,7 +56,10 @@ class ApiResponse(
     @typing.overload
     def __getitem__(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["code", "type", "message", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 805be04364f..5ff3b00e886 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -56,7 +56,10 @@ class ApiResponse(
     @typing.overload
     def __getitem__(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["code", "type", "message", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 c25c35f49d0..b013e41bd6d 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
@@ -81,7 +81,10 @@ class Apple(
     @typing.overload
     def __getitem__(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["cultivar", "origin", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index 39beb5ff696..0d921df97c3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -68,7 +68,10 @@ class Apple(
     @typing.overload
     def __getitem__(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["cultivar", "origin", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index 96269e9cdd6..9c66adf1e48 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -54,10 +54,7 @@ class AppleReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index 96269e9cdd6..9c66adf1e48 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -54,10 +54,7 @@ class AppleReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 97e09692c58..61ccb1e652a 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
@@ -88,7 +88,10 @@ class ArrayOfArrayOfNumberOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["ArrayArrayNumber", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index 97e09692c58..61ccb1e652a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -88,7 +88,10 @@ class ArrayOfArrayOfNumberOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["ArrayArrayNumber", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 72754519cd1..f6c63a3526e 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
@@ -66,7 +66,10 @@ class ArrayOfNumberOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["ArrayNumber", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 72754519cd1..f6c63a3526e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -66,7 +66,10 @@ class ArrayOfNumberOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["ArrayNumber", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 9aa1f23d34e..471d11f3cd3 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
@@ -170,7 +170,10 @@ class ArrayTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index 9aa1f23d34e..471d11f3cd3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -170,7 +170,10 @@ class ArrayTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index 36acd0a6a82..fe3cd40ee86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -47,7 +47,10 @@ class Banana(
     @typing.overload
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
-    def __getitem__(self, name: typing.Literal["lengthCm", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index 36acd0a6a82..fe3cd40ee86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -47,7 +47,10 @@ class Banana(
     @typing.overload
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
-    def __getitem__(self, name: typing.Literal["lengthCm", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 6b1ebf3453d..87b0053a518 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -54,10 +54,7 @@ class BananaReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 6b1ebf3453d..87b0053a518 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -54,10 +54,7 @@ class BananaReq(
     @typing.overload
     def __getitem__(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index fce5cf6c1c8..cf9a32c8c2e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -61,7 +61,10 @@ class BasquePig(
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    def __getitem__(self, name: typing.Literal["className", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index fce5cf6c1c8..cf9a32c8c2e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -61,7 +61,10 @@ class BasquePig(
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    def __getitem__(self, name: typing.Literal["className", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index 5ae0f8a3cc5..efeff03f383 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -74,7 +74,10 @@ class Capitalization(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index 5ae0f8a3cc5..efeff03f383 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -74,7 +74,10 @@ class Capitalization(
     @typing.overload
     def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 22bbff2a402..a2fa121dad8 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
@@ -52,7 +52,10 @@ class Cat(
             @typing.overload
             def __getitem__(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["declawed", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index 22bbff2a402..a2fa121dad8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -52,7 +52,10 @@ class Cat(
             @typing.overload
             def __getitem__(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["declawed", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
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 67abae57cae..d5eaf480194 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
@@ -53,7 +53,10 @@ class Category(
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "id", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index 67abae57cae..d5eaf480194 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -53,7 +53,10 @@ class Category(
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "id", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 f0ef7326ba4..044547999a2 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
@@ -52,7 +52,10 @@ class ChildCat(
             @typing.overload
             def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["name", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index f0ef7326ba4..044547999a2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -52,7 +52,10 @@ class ChildCat(
             @typing.overload
             def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["name", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
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 2b6ba9650e4..80479e80e76 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
@@ -47,7 +47,10 @@ class ClassModel(
     @typing.overload
     def __getitem__(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["_class", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index 2b6ba9650e4..80479e80e76 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -47,7 +47,10 @@ class ClassModel(
     @typing.overload
     def __getitem__(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["_class", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 4ef7a97a89a..fc8510eb89d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -44,7 +44,10 @@ class Client(
     @typing.overload
     def __getitem__(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["client", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 4ef7a97a89a..fc8510eb89d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -44,7 +44,10 @@ class Client(
     @typing.overload
     def __getitem__(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["client", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 60fa552fd0b..c6881296e78 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
@@ -66,7 +66,10 @@ class ComplexQuadrilateral(
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 60fa552fd0b..c6881296e78 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -66,7 +66,10 @@ class ComplexQuadrilateral(
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index 7d763777331..e0d3700e7e3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -61,7 +61,10 @@ class DanishPig(
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    def __getitem__(self, name: typing.Literal["className", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index 7d763777331..e0d3700e7e3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -61,7 +61,10 @@ class DanishPig(
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
-    def __getitem__(self, name: typing.Literal["className", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 d89c21b148d..33809d7e559 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
@@ -52,7 +52,10 @@ class Dog(
             @typing.overload
             def __getitem__(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["breed", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index d89c21b148d..33809d7e559 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -52,7 +52,10 @@ class Dog(
             @typing.overload
             def __getitem__(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["breed", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
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 aefb1a090de..e9c78c25ebf 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
@@ -108,7 +108,7 @@ class Drawing(
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
index aefb1a090de..e9c78c25ebf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
@@ -108,7 +108,7 @@ class Drawing(
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 f5e036df4bb..2ad98e28eba 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
@@ -112,7 +112,10 @@ class EnumArrays(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["just_symbol", "array_enum", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index f5e036df4bb..2ad98e28eba 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -112,7 +112,10 @@ class EnumArrays(
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["just_symbol", "array_enum", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 1adec63515a..5d111bd6ac7 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
@@ -207,7 +207,10 @@ class EnumTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index 1adec63515a..5d111bd6ac7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -207,7 +207,10 @@ class EnumTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 f71f4bc846e..03ec30eedae 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
@@ -66,7 +66,10 @@ class EquilateralTriangle(
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["triangleType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index f71f4bc846e..03ec30eedae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -66,7 +66,10 @@ class EquilateralTriangle(
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["triangleType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index bd6c42a38a7..5c7966970a1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -46,7 +46,10 @@ class File(
     @typing.overload
     def __getitem__(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["sourceURI", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index bd6c42a38a7..5c7966970a1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -46,7 +46,10 @@ class File(
     @typing.overload
     def __getitem__(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["sourceURI", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 21a221b9e44..644cfd3db81 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
@@ -80,7 +80,10 @@ class FileSchemaTestClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["file", "files", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 21a221b9e44..644cfd3db81 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -80,7 +80,10 @@ class FileSchemaTestClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["file", "files", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index c97d9b5d469..4c9a566211f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -44,7 +44,10 @@ class Foo(
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["bar", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index c97d9b5d469..4c9a566211f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -44,7 +44,10 @@ class Foo(
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["bar", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 be9e14d0466..3186c1b027e 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
@@ -284,7 +284,10 @@ class FormatTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index 65aa068eac9..dc8bceb9089 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -236,7 +236,10 @@ class FormatTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 9196ceff5b6..4c037818311 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
@@ -61,7 +61,10 @@ class Fruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["color", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 9196ceff5b6..4c037818311 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -61,7 +61,10 @@ class Fruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["color", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 483619ba35d..0665afe0702 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
@@ -61,7 +61,10 @@ class GmFruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["color", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 483619ba35d..0665afe0702 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -61,7 +61,10 @@ class GmFruit(
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["color", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index 4a116b11098..7dea770e2c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -57,7 +57,10 @@ class GrandparentAnimal(
     @typing.overload
     def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
-    def __getitem__(self, name: typing.Literal["pet_type", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index 4a116b11098..7dea770e2c2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -57,7 +57,10 @@ class GrandparentAnimal(
     @typing.overload
     def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
-    def __getitem__(self, name: typing.Literal["pet_type", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index b3a96eeb196..985333de006 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -50,7 +50,10 @@ class HasOnlyReadOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["bar", "foo", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index b3a96eeb196..985333de006 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -50,7 +50,10 @@ class HasOnlyReadOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["bar", "foo", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 b21c3e6c715..4b88eb60e2c 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
@@ -66,7 +66,10 @@ class HealthCheckResult(
     @typing.overload
     def __getitem__(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["NullableMessage", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index b21c3e6c715..4b88eb60e2c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -66,7 +66,10 @@ class HealthCheckResult(
     @typing.overload
     def __getitem__(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["NullableMessage", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 ab839a02e10..ea6ba91fccf 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
@@ -66,7 +66,10 @@ class IsoscelesTriangle(
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["triangleType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index ab839a02e10..ea6ba91fccf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -66,7 +66,10 @@ class IsoscelesTriangle(
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["triangleType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index 6b82a5c0dd5..a1bd29b8efb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -206,7 +206,10 @@ class MapTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index 6b82a5c0dd5..a1bd29b8efb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -206,7 +206,10 @@ class MapTest(
     @typing.overload
     def __getitem__(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index bf7215d11ad..8f4a9d59aee 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -90,7 +90,10 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["uuid", "dateTime", "map", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index bf7215d11ad..8f4a9d59aee 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -90,7 +90,10 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     @typing.overload
     def __getitem__(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["uuid", "dateTime", "map", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 a6aee4d8a18..a75cba75083 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
@@ -52,7 +52,10 @@ class Model200Response(
     @typing.overload
     def __getitem__(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "class", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index a6aee4d8a18..a75cba75083 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -52,7 +52,10 @@ class Model200Response(
     @typing.overload
     def __getitem__(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "class", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(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 e0cde77414d..2f389a3befd 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
@@ -46,7 +46,10 @@ class ModelReturn(
     @typing.overload
     def __getitem__(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["return", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index e0cde77414d..2f389a3befd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -46,7 +46,10 @@ class ModelReturn(
     @typing.overload
     def __getitem__(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["return", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 412ef6780f2..7298a7a920e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -58,7 +58,10 @@ class Money(
     @typing.overload
     def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
     
-    def __getitem__(self, name: typing.Literal["amount", "currency", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 412ef6780f2..7298a7a920e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -58,7 +58,10 @@ class Money(
     @typing.overload
     def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
     
-    def __getitem__(self, name: typing.Literal["amount", "currency", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 710ce877a3d..84c27b0e017 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
@@ -61,7 +61,10 @@ class Name(
     @typing.overload
     def __getitem__(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "snake_case", "property", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 710ce877a3d..84c27b0e017 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -61,7 +61,10 @@ class Name(
     @typing.overload
     def __getitem__(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "snake_case", "property", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 16f15162217..d8056590f51 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -54,10 +54,7 @@ class NoAdditionalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["petId"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 16f15162217..d8056590f51 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -54,10 +54,7 @@ class NoAdditionalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
     
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["id"], typing.Literal["petId"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 dcfcf412a8d..72d129f4aa1 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
@@ -514,7 +514,7 @@ class NullableClass(
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index dcfcf412a8d..72d129f4aa1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -514,7 +514,7 @@ class NullableClass(
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 9fb146bc886..5604c9bcc84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -44,7 +44,10 @@ class NumberOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["JustNumber", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 9fb146bc886..5604c9bcc84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -44,7 +44,10 @@ class NumberOnly(
     @typing.overload
     def __getitem__(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["JustNumber", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index ccb00bc9537..63c9979af9b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -62,7 +62,10 @@ class ObjectModelWithRefProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["myNumber", "myString", "myBoolean", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index ccb00bc9537..63c9979af9b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -62,7 +62,10 @@ class ObjectModelWithRefProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["myNumber", "myString", "myBoolean", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index ff341c4e8d4..f67ae71d2b7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -60,7 +60,10 @@ class ObjectWithDecimalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["length", "width", "cost", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index ff341c4e8d4..f67ae71d2b7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -60,7 +60,10 @@ class ObjectWithDecimalProperties(
     @typing.overload
     def __getitem__(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["length", "width", "cost", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index 408e2c94cee..483bd34d69b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -58,7 +58,10 @@ class ObjectWithDifficultlyNamedProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["123-list", "$special[property.name]", "123Number", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index 408e2c94cee..483bd34d69b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -58,7 +58,10 @@ class ObjectWithDifficultlyNamedProps(
     @typing.overload
     def __getitem__(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["123-list", "$special[property.name]", "123Number", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 13401d619dc..f83ca758e86 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
@@ -89,7 +89,10 @@ class ObjectWithInlineCompositionProperty(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 9e2b4116f7f..ded283243c7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -86,7 +86,10 @@ class ObjectWithInlineCompositionProperty(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index 395251fe828..bf1d3b168de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -100,7 +100,10 @@ class Order(
     @typing.overload
     def __getitem__(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index 395251fe828..bf1d3b168de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -100,7 +100,10 @@ class Order(
     @typing.overload
     def __getitem__(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 c98de5fd22d..a6f24ed36f5 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
@@ -158,7 +158,10 @@ class Pet(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index c98de5fd22d..a6f24ed36f5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -158,7 +158,10 @@ class Pet(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 8b134286a60..6d9089c7b21 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -56,7 +56,10 @@ class Player(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "enemyPlayer", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 8b134286a60..6d9089c7b21 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -56,7 +56,10 @@ class Player(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "enemyPlayer", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 7fbadc1a3f3..12bf6d8938e 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
@@ -69,7 +69,10 @@ class QuadrilateralInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
-    def __getitem__(self, name: typing.Literal["shapeType", "quadrilateralType", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 7fbadc1a3f3..12bf6d8938e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -69,7 +69,10 @@ class QuadrilateralInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
-    def __getitem__(self, name: typing.Literal["shapeType", "quadrilateralType", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index 36b3853dc6b..550e0f25410 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -50,7 +50,10 @@ class ReadOnlyFirst(
     @typing.overload
     def __getitem__(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["bar", "baz", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index 36b3853dc6b..550e0f25410 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -50,7 +50,10 @@ class ReadOnlyFirst(
     @typing.overload
     def __getitem__(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["bar", "baz", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 d6abad56b59..8369141ef7c 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
@@ -66,7 +66,10 @@ class ScaleneTriangle(
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["triangleType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index d6abad56b59..8369141ef7c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -66,7 +66,10 @@ class ScaleneTriangle(
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["triangleType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
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 a732fe6ef66..19338945b09 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
@@ -66,7 +66,10 @@ class SimpleQuadrilateral(
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index a732fe6ef66..19338945b09 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -66,7 +66,10 @@ class SimpleQuadrilateral(
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
             
-            def __getitem__(self, name: typing.Literal["quadrilateralType", ]):
+            @typing.overload
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
                     return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 808997801fb..f4a8385b73d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -46,7 +46,10 @@ class SpecialModelName(
     @typing.overload
     def __getitem__(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["a", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 808997801fb..f4a8385b73d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -46,7 +46,10 @@ class SpecialModelName(
     @typing.overload
     def __getitem__(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["a", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index 9c978473f92..dcc876507a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -50,7 +50,10 @@ class Tag(
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "name", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index 9c978473f92..dcc876507a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -50,7 +50,10 @@ class Tag(
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "name", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 a6d8196a0e4..12456085b37 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
@@ -69,7 +69,10 @@ class TriangleInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
-    def __getitem__(self, name: typing.Literal["shapeType", "triangleType", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index a6d8196a0e4..12456085b37 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -69,7 +69,10 @@ class TriangleInterface(
     @typing.overload
     def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
-    def __getitem__(self, name: typing.Literal["shapeType", "triangleType", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 c52f5e72f38..84f9b44377b 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
@@ -160,7 +160,10 @@ class User(
     @typing.overload
     def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index c52f5e72f38..84f9b44377b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -160,7 +160,10 @@ class User(
     @typing.overload
     def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 acce1a7a8f9..778f85f245b 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
@@ -73,7 +73,10 @@ class Whale(
     @typing.overload
     def __getitem__(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["className", "hasBaleen", "hasTeeth", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index acce1a7a8f9..778f85f245b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -73,7 +73,10 @@ class Whale(
     @typing.overload
     def __getitem__(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["className", "hasBaleen", "hasTeeth", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 480af1290da..339014133f4 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
@@ -97,7 +97,7 @@ class Zebra(
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], typing.Literal["type"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
index 480af1290da..339014133f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
@@ -97,7 +97,7 @@ class Zebra(
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["className"], typing.Literal["type"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 2b079761dba..20080675e53 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
@@ -204,7 +204,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index 1f4eefca537..b1f3999c8bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -166,7 +166,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 05985974b11..62a5f90e251 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
@@ -377,7 +377,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["enum_form_string_array", "enum_form_string", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index f2dd26e36e7..4345fa77230 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -301,7 +301,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["enum_form_string_array", "enum_form_string", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 85ba7127f9a..06f7cc2d795 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
@@ -136,7 +136,10 @@ class CompositionInPropertySchema(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -302,7 +305,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -446,7 +452,10 @@ class SchemaFor200ResponseBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index a068820b775..1ccc16b23a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -128,7 +128,10 @@ class CompositionInPropertySchema(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -257,7 +260,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
@@ -385,7 +391,10 @@ class SchemaFor200ResponseBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["someProp", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index fea3a14cbe4..07bf8e63386 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -55,7 +55,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
-    def __getitem__(self, name: typing.Literal["param", "param2", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index eb2d3df1d66..9275d59ca09 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -53,7 +53,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
-    def __getitem__(self, name: typing.Literal["param", "param2", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index dfeba050cb1..78b9165f8f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -44,7 +44,10 @@ class MapBeanSchema(
     @typing.overload
     def __getitem__(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["keyword", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index 081a917302c..9289ae39300 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -42,7 +42,10 @@ class MapBeanSchema(
     @typing.overload
     def __getitem__(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["keyword", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 05fa24e67ee..e7a9260322f 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
@@ -82,7 +82,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
-    def __getitem__(self, name: typing.Literal["additionalMetadata", "requiredFile", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index f025f0560d8..1284d63fe93 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -56,7 +56,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
-    def __getitem__(self, name: typing.Literal["additionalMetadata", "requiredFile", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 bc9f732d707..ccad7cab618 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
@@ -56,7 +56,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
-    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index c508da08fc5..65174318dad 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -54,7 +54,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
-    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
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 5914b8fb171..ed82c99a37e 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
@@ -69,7 +69,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["files", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 3b50edbdd61..40d4c911a83 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -67,7 +67,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["files", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index 9b69a953340..1450fed335a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -50,7 +50,10 @@ class SchemaFor0ResponseBodyApplicationJson(
     @typing.overload
     def __getitem__(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["string", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index f53d8e90263..f429c2f2aaa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -48,7 +48,10 @@ class SchemaFor0ResponseBodyApplicationJson(
     @typing.overload
     def __getitem__(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["string", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index d6644cd9d20..51fd511afc7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -77,7 +77,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "status", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index 543448b6501..78a1535e1a4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -51,7 +51,10 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     @typing.overload
     def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["name", "status", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index a7f6f1ae0e4..23598348b41 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -79,7 +79,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index e1ebbc18757..6c45ff35e49 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -53,7 +53,10 @@ class SchemaForRequestBodyMultipartFormData(
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Literal["additionalMetadata", "file", ]):
+    @typing.overload
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
             return super().__getitem__(name)
-- 
GitLab


From b90d93279ac39b76d0cf03771665f625d4407999 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Fri, 2 Sep 2022 14:15:55 -0700
Subject: [PATCH 14/30] Updates sample, readme updated

---
 .../python-experimental/README.handlebars     |  8 +++----
 .../model_templates/new.handlebars            |  2 +-
 ..._getitems_with_addprops_getitem.handlebars |  2 --
 ...perty_getitems_without_addprops.handlebars |  2 --
 .../python-experimental/schemas.handlebars    |  7 ++++++
 .../petstore/python-experimental/README.md    |  8 +++----
 .../model/additional_properties_class.py      | 14 +----------
 .../model/additional_properties_class.pyi     | 14 +----------
 ...ditional_properties_with_array_of_enums.py |  2 --
 ...itional_properties_with_array_of_enums.pyi |  2 --
 .../petstore_api/model/address.py             |  2 --
 .../petstore_api/model/address.pyi            |  2 --
 .../petstore_api/model/animal.py              |  4 +---
 .../petstore_api/model/animal.pyi             |  4 +---
 .../petstore_api/model/any_type_not_string.py |  2 +-
 .../model/any_type_not_string.pyi             |  2 +-
 .../petstore_api/model/api_response.py        |  4 +---
 .../petstore_api/model/api_response.pyi       |  4 +---
 .../petstore_api/model/apple.py               |  4 +---
 .../petstore_api/model/apple.pyi              |  4 +---
 .../petstore_api/model/apple_req.py           |  2 --
 .../petstore_api/model/apple_req.pyi          |  2 --
 .../model/array_of_array_of_number_only.py    |  4 +---
 .../model/array_of_array_of_number_only.pyi   |  4 +---
 .../model/array_of_number_only.py             |  4 +---
 .../model/array_of_number_only.pyi            |  4 +---
 .../petstore_api/model/array_test.py          |  4 +---
 .../petstore_api/model/array_test.pyi         |  4 +---
 .../petstore_api/model/banana.py              |  4 +---
 .../petstore_api/model/banana.pyi             |  4 +---
 .../petstore_api/model/banana_req.py          |  2 --
 .../petstore_api/model/banana_req.pyi         |  2 --
 .../petstore_api/model/basque_pig.py          |  4 +---
 .../petstore_api/model/basque_pig.pyi         |  4 +---
 .../petstore_api/model/capitalization.py      |  4 +---
 .../petstore_api/model/capitalization.pyi     |  4 +---
 .../petstore_api/model/cat.py                 |  6 ++---
 .../petstore_api/model/cat.pyi                |  6 ++---
 .../petstore_api/model/category.py            |  4 +---
 .../petstore_api/model/category.pyi           |  4 +---
 .../petstore_api/model/child_cat.py           |  6 ++---
 .../petstore_api/model/child_cat.pyi          |  6 ++---
 .../petstore_api/model/class_model.py         |  4 +---
 .../petstore_api/model/class_model.pyi        |  4 +---
 .../petstore_api/model/client.py              |  4 +---
 .../petstore_api/model/client.pyi             |  4 +---
 .../model/complex_quadrilateral.py            |  6 ++---
 .../model/complex_quadrilateral.pyi           |  6 ++---
 ...d_any_of_different_types_no_validations.py |  2 +-
 ..._any_of_different_types_no_validations.pyi |  2 +-
 .../petstore_api/model/composed_object.py     |  2 +-
 .../petstore_api/model/composed_object.pyi    |  2 +-
 .../model/composed_one_of_different_types.py  |  4 ++--
 .../model/composed_one_of_different_types.pyi |  4 ++--
 .../petstore_api/model/danish_pig.py          |  4 +---
 .../petstore_api/model/danish_pig.pyi         |  4 +---
 .../petstore_api/model/dog.py                 |  6 ++---
 .../petstore_api/model/dog.pyi                |  6 ++---
 .../petstore_api/model/drawing.py             |  2 --
 .../petstore_api/model/drawing.pyi            |  2 --
 .../petstore_api/model/enum_arrays.py         |  4 +---
 .../petstore_api/model/enum_arrays.pyi        |  4 +---
 .../petstore_api/model/enum_test.py           |  4 +---
 .../petstore_api/model/enum_test.pyi          |  4 +---
 .../model/equilateral_triangle.py             |  6 ++---
 .../model/equilateral_triangle.pyi            |  6 ++---
 .../petstore_api/model/file.py                |  4 +---
 .../petstore_api/model/file.pyi               |  4 +---
 .../model/file_schema_test_class.py           |  4 +---
 .../model/file_schema_test_class.pyi          |  4 +---
 .../petstore_api/model/foo.py                 |  4 +---
 .../petstore_api/model/foo.pyi                |  4 +---
 .../petstore_api/model/format_test.py         |  4 +---
 .../petstore_api/model/format_test.pyi        |  4 +---
 .../petstore_api/model/fruit.py               |  4 +---
 .../petstore_api/model/fruit.pyi              |  4 +---
 .../petstore_api/model/fruit_req.py           |  2 +-
 .../petstore_api/model/fruit_req.pyi          |  2 +-
 .../petstore_api/model/gm_fruit.py            |  4 +---
 .../petstore_api/model/gm_fruit.pyi           |  4 +---
 .../petstore_api/model/grandparent_animal.py  |  4 +---
 .../petstore_api/model/grandparent_animal.pyi |  4 +---
 .../petstore_api/model/has_only_read_only.py  |  4 +---
 .../petstore_api/model/has_only_read_only.pyi |  4 +---
 .../petstore_api/model/health_check_result.py |  4 +---
 .../model/health_check_result.pyi             |  4 +---
 .../petstore_api/model/isosceles_triangle.py  |  6 ++---
 .../petstore_api/model/isosceles_triangle.pyi |  6 ++---
 .../petstore_api/model/mammal.py              |  2 +-
 .../petstore_api/model/mammal.pyi             |  2 +-
 .../petstore_api/model/map_test.py            | 12 +---------
 .../petstore_api/model/map_test.pyi           | 12 +---------
 ...perties_and_additional_properties_class.py |  6 +----
 ...erties_and_additional_properties_class.pyi |  6 +----
 .../petstore_api/model/model200_response.py   |  4 +---
 .../petstore_api/model/model200_response.pyi  |  4 +---
 .../petstore_api/model/model_return.py        |  4 +---
 .../petstore_api/model/model_return.pyi       |  4 +---
 .../petstore_api/model/money.py               |  4 +---
 .../petstore_api/model/money.pyi              |  4 +---
 .../petstore_api/model/name.py                |  4 +---
 .../petstore_api/model/name.pyi               |  4 +---
 .../model/no_additional_properties.py         |  2 --
 .../model/no_additional_properties.pyi        |  2 --
 .../petstore_api/model/nullable_class.py      | 18 ++++----------
 .../petstore_api/model/nullable_class.pyi     | 18 ++++----------
 .../petstore_api/model/nullable_shape.py      |  2 +-
 .../petstore_api/model/nullable_shape.pyi     |  2 +-
 .../petstore_api/model/number_only.py         |  4 +---
 .../petstore_api/model/number_only.pyi        |  4 +---
 .../model/object_model_with_ref_props.py      |  4 +---
 .../model/object_model_with_ref_props.pyi     |  4 +---
 .../model/object_with_decimal_properties.py   |  4 +---
 .../model/object_with_decimal_properties.pyi  |  4 +---
 .../object_with_difficultly_named_props.py    |  4 +---
 .../object_with_difficultly_named_props.pyi   |  4 +---
 ...object_with_inline_composition_property.py |  6 ++---
 ...bject_with_inline_composition_property.pyi |  6 ++---
 .../model/object_with_validations.py          |  2 +-
 .../model/object_with_validations.pyi         |  2 +-
 .../petstore_api/model/order.py               |  4 +---
 .../petstore_api/model/order.pyi              |  4 +---
 .../petstore_api/model/parent_pet.py          |  2 +-
 .../petstore_api/model/parent_pet.pyi         |  2 +-
 .../petstore_api/model/pet.py                 |  4 +---
 .../petstore_api/model/pet.pyi                |  4 +---
 .../petstore_api/model/pig.py                 |  2 +-
 .../petstore_api/model/pig.pyi                |  2 +-
 .../petstore_api/model/player.py              |  4 +---
 .../petstore_api/model/player.pyi             |  4 +---
 .../petstore_api/model/quadrilateral.py       |  2 +-
 .../petstore_api/model/quadrilateral.pyi      |  2 +-
 .../model/quadrilateral_interface.py          |  4 +---
 .../model/quadrilateral_interface.pyi         |  4 +---
 .../petstore_api/model/read_only_first.py     |  4 +---
 .../petstore_api/model/read_only_first.pyi    |  4 +---
 .../petstore_api/model/scalene_triangle.py    |  6 ++---
 .../petstore_api/model/scalene_triangle.pyi   |  6 ++---
 .../petstore_api/model/shape.py               |  2 +-
 .../petstore_api/model/shape.pyi              |  2 +-
 .../petstore_api/model/shape_or_null.py       |  2 +-
 .../petstore_api/model/shape_or_null.pyi      |  2 +-
 .../model/simple_quadrilateral.py             |  6 ++---
 .../model/simple_quadrilateral.pyi            |  6 ++---
 .../petstore_api/model/some_object.py         |  2 +-
 .../petstore_api/model/some_object.pyi        |  2 +-
 .../petstore_api/model/special_model_name.py  |  4 +---
 .../petstore_api/model/special_model_name.pyi |  4 +---
 .../petstore_api/model/string_boolean_map.py  |  2 --
 .../petstore_api/model/string_boolean_map.pyi |  2 --
 .../petstore_api/model/tag.py                 |  4 +---
 .../petstore_api/model/tag.pyi                |  4 +---
 .../petstore_api/model/triangle.py            |  2 +-
 .../petstore_api/model/triangle.pyi           |  2 +-
 .../petstore_api/model/triangle_interface.py  |  4 +---
 .../petstore_api/model/triangle_interface.pyi |  4 +---
 .../petstore_api/model/user.py                |  8 +++----
 .../petstore_api/model/user.pyi               |  8 +++----
 .../petstore_api/model/whale.py               |  4 +---
 .../petstore_api/model/whale.pyi              |  4 +---
 .../petstore_api/model/zebra.py               |  2 --
 .../petstore_api/model/zebra.pyi              |  2 --
 .../petstore_api/paths/fake_1/post.py         |  4 +---
 .../petstore_api/paths/fake_1/post.pyi        |  4 +---
 .../petstore_api/paths/fake_2/get.py          |  4 +---
 .../petstore_api/paths/fake_2/get.pyi         |  4 +---
 .../fake_inline_additional_properties/post.py |  2 --
 .../post.pyi                                  |  2 --
 .../paths/fake_inline_composition_/post.py    | 24 +++++++------------
 .../paths/fake_inline_composition_/post.pyi   | 24 +++++++------------
 .../paths/fake_json_form_data/get.py          |  4 +---
 .../paths/fake_json_form_data/get.pyi         |  4 +---
 .../paths/fake_obj_in_query/get.py            |  4 +---
 .../paths/fake_obj_in_query/get.pyi           |  4 +---
 .../post.py                                   |  4 +---
 .../post.pyi                                  |  4 +---
 .../paths/fake_upload_file/post.py            |  4 +---
 .../paths/fake_upload_file/post.pyi           |  4 +---
 .../paths/fake_upload_files/post.py           |  4 +---
 .../paths/fake_upload_files/post.pyi          |  4 +---
 .../petstore_api/paths/foo/get.py             |  4 +---
 .../petstore_api/paths/foo/get.pyi            |  4 +---
 .../petstore_api/paths/pet_pet_id_3/post.py   |  4 +---
 .../petstore_api/paths/pet_pet_id_3/post.pyi  |  4 +---
 .../paths/pet_pet_id_upload_image/post.py     |  4 +---
 .../paths/pet_pet_id_upload_image/post.pyi    |  4 +---
 .../petstore_api/paths/store_inventory/get.py |  2 --
 .../paths/store_inventory/get.pyi             |  2 --
 .../petstore_api/schemas.py                   |  7 ++++++
 189 files changed, 231 insertions(+), 589 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
index 70d83265cfe..6f79a861aa9 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
@@ -50,13 +50,11 @@ object schema properties as classes
     keyword in one schema, and include a format constraint in another schema
     - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
     - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. If object(dict) properties are accessed and they do not exist, then two things could happen
+7. If object(dict) properties are accessed and they do not exist then schemas.unset will be returned
     - When accessed with model_instance.someProp or model_instance["someProp"] and someProp is not in the payload,
-    then two possible results can be returned. If someProp is defined in any of the validated schemas
-    where it will have to be optional, then the value schemas.unset will be returned.
-    If someProp was not defined as an explicit property in any of those schemas, then a KeyError will be raised.
+    then schemas.unset will be returned.
     - This was done so type hints for optional properties could show that schemas.Unset is a valid value.
-    - So you will need to update code to handle thrown KeyErrors or schema.unset values
+    - So you will need to update code to schema.unset values because KeyErrors will not be thrown
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
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 429ff63c7e3..eb47a54a035 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
@@ -46,7 +46,7 @@ def __new__(
 {{/unless}}
 {{else}}
 {{#or isMap isAnyType}}
-    **kwargs,
+    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
 {{/or}}
 {{/with}}
 ) -> '{{> model_templates/classname }}':
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
index 17e1e8b85ee..0b732f454ed 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
@@ -1,7 +1,5 @@
 def __getitem__(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
     # dict_instance[name] accessor
-    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-        return super().__getitem__(name)
     try:
         return super().__getitem__(name)
     except KeyError:
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
index 780bba95d58..e31ed3c1962 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
@@ -18,8 +18,6 @@ def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.
 
 def __getitem__(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
     # dict_instance[name] accessor
-    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-        return super().__getitem__(name)
     try:
         return super().__getitem__(name)
     except KeyError:
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 40a9ceb39f4..4503ca9bc96 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -2180,6 +2180,13 @@ class DictSchema(
     def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
         return super().__new__(cls, *args, **kwargs)
 
+    def __getitem__(self, name: str):
+        # dict_instance[name] accessor
+        try:
+            return super().__getitem__(name)
+        except KeyError:
+            return unset
+
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema}
 
diff --git a/samples/openapi3/client/petstore/python-experimental/README.md b/samples/openapi3/client/petstore/python-experimental/README.md
index d7f8070d5cb..0b511c6c926 100644
--- a/samples/openapi3/client/petstore/python-experimental/README.md
+++ b/samples/openapi3/client/petstore/python-experimental/README.md
@@ -42,13 +42,11 @@ object schema properties as classes
     keyword in one schema, and include a format constraint in another schema
     - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
     - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. If object(dict) properties are accessed and they do not exist, then two things could happen
+7. If object(dict) properties are accessed and they do not exist then schemas.unset will be returned
     - When accessed with model_instance.someProp or model_instance["someProp"] and someProp is not in the payload,
-    then two possible results can be returned. If someProp is defined in any of the validated schemas
-    where it will have to be optional, then the value schemas.unset will be returned.
-    If someProp was not defined as an explicit property in any of those schemas, then a KeyError will be raised.
+    then schemas.unset will be returned.
     - This was done so type hints for optional properties could show that schemas.Unset is a valid value.
-    - So you will need to update code to handle thrown KeyErrors or schema.unset values
+    - So you will need to update code to schema.unset values because KeyErrors will not be thrown
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 2778e0190e4..5208f34c796 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -46,8 +46,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -85,8 +83,6 @@ class AdditionalPropertiesClass(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
                             try:
                                 return super().__getitem__(name)
                             except KeyError:
@@ -107,8 +103,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -141,8 +135,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -192,8 +184,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -260,8 +250,6 @@ class AdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -280,7 +268,7 @@ class AdditionalPropertiesClass(
         empty_map: typing.Union[MetaOapg.properties.empty_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 2778e0190e4..5208f34c796 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -46,8 +46,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -85,8 +83,6 @@ class AdditionalPropertiesClass(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
                             try:
                                 return super().__getitem__(name)
                             except KeyError:
@@ -107,8 +103,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -141,8 +135,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -192,8 +184,6 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -260,8 +250,6 @@ class AdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -280,7 +268,7 @@ class AdditionalPropertiesClass(
         empty_map: typing.Union[MetaOapg.properties.empty_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
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 b9583460ec0..919595896e5 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
@@ -63,8 +63,6 @@ class AdditionalPropertiesWithArrayOfEnums(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
index b9583460ec0..919595896e5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
@@ -63,8 +63,6 @@ class AdditionalPropertiesWithArrayOfEnums(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
index 3f040a997cd..525ef854c2b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
@@ -37,8 +37,6 @@ class Address(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
index 3f040a997cd..525ef854c2b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
@@ -37,8 +37,6 @@ class Address(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 59cc9432ce2..4c881004297 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -68,8 +68,6 @@ class Animal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -82,7 +80,7 @@ class Animal(
         className: typing.Union[MetaOapg.properties.className, str, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Animal':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 59cc9432ce2..4c881004297 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -68,8 +68,6 @@ class Animal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -82,7 +80,7 @@ class Animal(
         className: typing.Union[MetaOapg.properties.className, str, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Animal':
         return super().__new__(
             cls,
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 8f635cd6001..49e5500a190 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
@@ -40,7 +40,7 @@ class AnyTypeNotString(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
index 8f635cd6001..49e5500a190 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/any_type_not_string.pyi
@@ -40,7 +40,7 @@ class AnyTypeNotString(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 5ff3b00e886..e95971a2569 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -61,8 +61,6 @@ class ApiResponse(
     
     def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -76,7 +74,7 @@ class ApiResponse(
         type: typing.Union[MetaOapg.properties.type, str, schemas.Unset] = schemas.unset,
         message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 5ff3b00e886..e95971a2569 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -61,8 +61,6 @@ class ApiResponse(
     
     def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -76,7 +74,7 @@ class ApiResponse(
         type: typing.Union[MetaOapg.properties.type, str, schemas.Unset] = schemas.unset,
         message: typing.Union[MetaOapg.properties.message, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
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 b013e41bd6d..a28c1afd2a9 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
@@ -86,8 +86,6 @@ class Apple(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -99,7 +97,7 @@ class Apple(
         *args: typing.Union[dict, frozendict.frozendict, None, ],
         origin: typing.Union[MetaOapg.properties.origin, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Apple':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index 0d921df97c3..b9919237a64 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -73,8 +73,6 @@ class Apple(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -86,7 +84,7 @@ class Apple(
         *args: typing.Union[dict, frozendict.frozendict, None, ],
         origin: typing.Union[MetaOapg.properties.origin, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Apple':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index 9c66adf1e48..b26f1e7fe7a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -56,8 +56,6 @@ class AppleReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index 9c66adf1e48..b26f1e7fe7a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -56,8 +56,6 @@ class AppleReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 61ccb1e652a..8cc51c1948a 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
@@ -93,8 +93,6 @@ class ArrayOfArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -106,7 +104,7 @@ class ArrayOfArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index 61ccb1e652a..8cc51c1948a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -93,8 +93,6 @@ class ArrayOfArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -106,7 +104,7 @@ class ArrayOfArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
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 f6c63a3526e..7c90d24c25c 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
@@ -71,8 +71,6 @@ class ArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -84,7 +82,7 @@ class ArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index f6c63a3526e..7c90d24c25c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -71,8 +71,6 @@ class ArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -84,7 +82,7 @@ class ArrayOfNumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
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 471d11f3cd3..a7dbd857444 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
@@ -175,8 +175,6 @@ class ArrayTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -190,7 +188,7 @@ class ArrayTest(
         array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, tuple, schemas.Unset] = schemas.unset,
         array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index 471d11f3cd3..a7dbd857444 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -175,8 +175,6 @@ class ArrayTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -190,7 +188,7 @@ class ArrayTest(
         array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, tuple, schemas.Unset] = schemas.unset,
         array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index fe3cd40ee86..21f802cfe04 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -52,8 +52,6 @@ class Banana(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -65,7 +63,7 @@ class Banana(
         *args: typing.Union[dict, frozendict.frozendict, ],
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Banana':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index fe3cd40ee86..21f802cfe04 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -52,8 +52,6 @@ class Banana(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -65,7 +63,7 @@ class Banana(
         *args: typing.Union[dict, frozendict.frozendict, ],
         lengthCm: typing.Union[MetaOapg.properties.lengthCm, decimal.Decimal, int, float, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Banana':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 87b0053a518..0dc6b0e25a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -56,8 +56,6 @@ class BananaReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 87b0053a518..0dc6b0e25a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -56,8 +56,6 @@ class BananaReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index cf9a32c8c2e..461e3f3a62f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -66,8 +66,6 @@ class BasquePig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class BasquePig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'BasquePig':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index cf9a32c8c2e..461e3f3a62f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -66,8 +66,6 @@ class BasquePig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class BasquePig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'BasquePig':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index efeff03f383..e3dd2b17b52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -79,8 +79,6 @@ class Capitalization(
     
     def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -97,7 +95,7 @@ class Capitalization(
         SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, str, schemas.Unset] = schemas.unset,
         ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Capitalization':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index efeff03f383..e3dd2b17b52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -79,8 +79,6 @@ class Capitalization(
     
     def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -97,7 +95,7 @@ class Capitalization(
         SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, str, schemas.Unset] = schemas.unset,
         ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Capitalization':
         return super().__new__(
             cls,
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 a2fa121dad8..500d766d1ca 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
@@ -57,8 +57,6 @@ class Cat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -70,7 +68,7 @@ class Cat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 declawed: typing.Union[MetaOapg.properties.declawed, bool, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -101,7 +99,7 @@ class Cat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Cat':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index a2fa121dad8..500d766d1ca 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -57,8 +57,6 @@ class Cat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -70,7 +68,7 @@ class Cat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 declawed: typing.Union[MetaOapg.properties.declawed, bool, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -101,7 +99,7 @@ class Cat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Cat':
         return super().__new__(
             cls,
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 d5eaf480194..973ab8edd14 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
@@ -58,8 +58,6 @@ class Category(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -72,7 +70,7 @@ class Category(
         name: typing.Union[MetaOapg.properties.name, str, ],
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Category':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index d5eaf480194..973ab8edd14 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -58,8 +58,6 @@ class Category(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -72,7 +70,7 @@ class Category(
         name: typing.Union[MetaOapg.properties.name, str, ],
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Category':
         return super().__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 044547999a2..b6ba3434542 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
@@ -57,8 +57,6 @@ class ChildCat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -70,7 +68,7 @@ class ChildCat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -101,7 +99,7 @@ class ChildCat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ChildCat':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 044547999a2..b6ba3434542 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -57,8 +57,6 @@ class ChildCat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -70,7 +68,7 @@ class ChildCat(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -101,7 +99,7 @@ class ChildCat(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ChildCat':
         return super().__new__(
             cls,
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 80479e80e76..c7d33c62a8f 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
@@ -52,8 +52,6 @@ class ClassModel(
     
     def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -65,7 +63,7 @@ class ClassModel(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _class: typing.Union[MetaOapg.properties._class, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ClassModel':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index 80479e80e76..c7d33c62a8f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -52,8 +52,6 @@ class ClassModel(
     
     def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -65,7 +63,7 @@ class ClassModel(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _class: typing.Union[MetaOapg.properties._class, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ClassModel':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index fc8510eb89d..29581a0f192 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -49,8 +49,6 @@ class Client(
     
     def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class Client(
         *args: typing.Union[dict, frozendict.frozendict, ],
         client: typing.Union[MetaOapg.properties.client, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Client':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index fc8510eb89d..29581a0f192 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -49,8 +49,6 @@ class Client(
     
     def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class Client(
         *args: typing.Union[dict, frozendict.frozendict, ],
         client: typing.Union[MetaOapg.properties.client, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Client':
         return super().__new__(
             cls,
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 c6881296e78..0a15285a605 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
@@ -71,8 +71,6 @@ class ComplexQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class ComplexQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class ComplexQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index c6881296e78..0a15285a605 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -71,8 +71,6 @@ class ComplexQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class ComplexQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class ComplexQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
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 692a6e2bcc3..f87ea2127ae 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
@@ -107,7 +107,7 @@ class ComposedAnyOfDifferentTypesNoValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
index 692a6e2bcc3..f87ea2127ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_any_of_different_types_no_validations.pyi
@@ -107,7 +107,7 @@ class ComposedAnyOfDifferentTypesNoValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
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 b521637fbc8..fc6b19dd8d9 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
@@ -56,7 +56,7 @@ class ComposedObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
index b521637fbc8..fc6b19dd8d9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_object.pyi
@@ -56,7 +56,7 @@ class ComposedObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
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 2902b958580..61b3c7b4733 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
@@ -52,7 +52,7 @@ class ComposedOneOfDifferentTypes(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_4':
                 return super().__new__(
                     cls,
@@ -123,7 +123,7 @@ class ComposedOneOfDifferentTypes(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
index 08d13d5c2c5..0f20ce77459 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/composed_one_of_different_types.pyi
@@ -50,7 +50,7 @@ class ComposedOneOfDifferentTypes(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_4':
                 return super().__new__(
                     cls,
@@ -114,7 +114,7 @@ class ComposedOneOfDifferentTypes(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index e0d3700e7e3..1c6e0c89c52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -66,8 +66,6 @@ class DanishPig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class DanishPig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'DanishPig':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index e0d3700e7e3..1c6e0c89c52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -66,8 +66,6 @@ class DanishPig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class DanishPig(
         *args: typing.Union[dict, frozendict.frozendict, ],
         className: typing.Union[MetaOapg.properties.className, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'DanishPig':
         return super().__new__(
             cls,
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 33809d7e559..b46ddc245a6 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
@@ -57,8 +57,6 @@ class Dog(
             
             def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -70,7 +68,7 @@ class Dog(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 breed: typing.Union[MetaOapg.properties.breed, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -101,7 +99,7 @@ class Dog(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Dog':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 33809d7e559..b46ddc245a6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -57,8 +57,6 @@ class Dog(
             
             def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -70,7 +68,7 @@ class Dog(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 breed: typing.Union[MetaOapg.properties.breed, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -101,7 +99,7 @@ class Dog(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Dog':
         return super().__new__(
             cls,
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 e9c78c25ebf..a738a309638 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
@@ -110,8 +110,6 @@ class Drawing(
     
     def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
index e9c78c25ebf..a738a309638 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
@@ -110,8 +110,6 @@ class Drawing(
     
     def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 2ad98e28eba..5b091711e0d 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
@@ -117,8 +117,6 @@ class EnumArrays(
     
     def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -131,7 +129,7 @@ class EnumArrays(
         just_symbol: typing.Union[MetaOapg.properties.just_symbol, str, schemas.Unset] = schemas.unset,
         array_enum: typing.Union[MetaOapg.properties.array_enum, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 2ad98e28eba..5b091711e0d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -117,8 +117,6 @@ class EnumArrays(
     
     def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -131,7 +129,7 @@ class EnumArrays(
         just_symbol: typing.Union[MetaOapg.properties.just_symbol, str, schemas.Unset] = schemas.unset,
         array_enum: typing.Union[MetaOapg.properties.array_enum, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
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 5d111bd6ac7..da504c2227e 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
@@ -212,8 +212,6 @@ class EnumTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -233,7 +231,7 @@ class EnumTest(
         IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EnumTest':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index 5d111bd6ac7..da504c2227e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -212,8 +212,6 @@ class EnumTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -233,7 +231,7 @@ class EnumTest(
         IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EnumTest':
         return super().__new__(
             cls,
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 03ec30eedae..d6c12fc194d 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
@@ -71,8 +71,6 @@ class EquilateralTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class EquilateralTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class EquilateralTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index 03ec30eedae..d6c12fc194d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -71,8 +71,6 @@ class EquilateralTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class EquilateralTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class EquilateralTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 5c7966970a1..28c677be1b2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -51,8 +51,6 @@ class File(
     
     def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -64,7 +62,7 @@ class File(
         *args: typing.Union[dict, frozendict.frozendict, ],
         sourceURI: typing.Union[MetaOapg.properties.sourceURI, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'File':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 5c7966970a1..28c677be1b2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -51,8 +51,6 @@ class File(
     
     def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -64,7 +62,7 @@ class File(
         *args: typing.Union[dict, frozendict.frozendict, ],
         sourceURI: typing.Union[MetaOapg.properties.sourceURI, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'File':
         return super().__new__(
             cls,
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 644cfd3db81..939c2979ef9 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
@@ -85,8 +85,6 @@ class FileSchemaTestClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -99,7 +97,7 @@ class FileSchemaTestClass(
         file: typing.Union['File', schemas.Unset] = schemas.unset,
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 644cfd3db81..939c2979ef9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -85,8 +85,6 @@ class FileSchemaTestClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -99,7 +97,7 @@ class FileSchemaTestClass(
         file: typing.Union['File', schemas.Unset] = schemas.unset,
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index 4c9a566211f..5f266595bd2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -49,8 +49,6 @@ class Foo(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class Foo(
         *args: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Foo':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index 4c9a566211f..5f266595bd2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -49,8 +49,6 @@ class Foo(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class Foo(
         *args: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Foo':
         return super().__new__(
             cls,
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 3186c1b027e..5eeb0092648 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
@@ -289,8 +289,6 @@ class FormatTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -321,7 +319,7 @@ class FormatTest(
         pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, str, schemas.Unset] = schemas.unset,
         noneProp: typing.Union[MetaOapg.properties.noneProp, None, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'FormatTest':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index dc8bceb9089..41b54489f02 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -241,8 +241,6 @@ class FormatTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -273,7 +271,7 @@ class FormatTest(
         pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, str, schemas.Unset] = schemas.unset,
         noneProp: typing.Union[MetaOapg.properties.noneProp, None, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'FormatTest':
         return super().__new__(
             cls,
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 4c037818311..83f21cad1af 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
@@ -66,8 +66,6 @@ class Fruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class Fruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Fruit':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 4c037818311..83f21cad1af 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -66,8 +66,6 @@ class Fruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class Fruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Fruit':
         return super().__new__(
             cls,
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 57fc281b82a..d0fccf47e6d 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
@@ -57,7 +57,7 @@ class FruitReq(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'FruitReq':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
index 57fc281b82a..d0fccf47e6d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit_req.pyi
@@ -57,7 +57,7 @@ class FruitReq(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'FruitReq':
         return super().__new__(
             cls,
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 0665afe0702..d8d5d5457a2 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
@@ -66,8 +66,6 @@ class GmFruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class GmFruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'GmFruit':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 0665afe0702..d8d5d5457a2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -66,8 +66,6 @@ class GmFruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -79,7 +77,7 @@ class GmFruit(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         color: typing.Union[MetaOapg.properties.color, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'GmFruit':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index 7dea770e2c2..adad2549e3b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -62,8 +62,6 @@ class GrandparentAnimal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class GrandparentAnimal(
         *args: typing.Union[dict, frozendict.frozendict, ],
         pet_type: typing.Union[MetaOapg.properties.pet_type, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index 7dea770e2c2..adad2549e3b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -62,8 +62,6 @@ class GrandparentAnimal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class GrandparentAnimal(
         *args: typing.Union[dict, frozendict.frozendict, ],
         pet_type: typing.Union[MetaOapg.properties.pet_type, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index 985333de006..e419f405be6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -55,8 +55,6 @@ class HasOnlyReadOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -69,7 +67,7 @@ class HasOnlyReadOnly(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index 985333de006..e419f405be6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -55,8 +55,6 @@ class HasOnlyReadOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -69,7 +67,7 @@ class HasOnlyReadOnly(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
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 4b88eb60e2c..31c78c27412 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
@@ -71,8 +71,6 @@ class HealthCheckResult(
     
     def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -84,7 +82,7 @@ class HealthCheckResult(
         *args: typing.Union[dict, frozendict.frozendict, ],
         NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 4b88eb60e2c..31c78c27412 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -71,8 +71,6 @@ class HealthCheckResult(
     
     def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -84,7 +82,7 @@ class HealthCheckResult(
         *args: typing.Union[dict, frozendict.frozendict, ],
         NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
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 ea6ba91fccf..08c1c75ce55 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
@@ -71,8 +71,6 @@ class IsoscelesTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class IsoscelesTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class IsoscelesTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index ea6ba91fccf..08c1c75ce55 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -71,8 +71,6 @@ class IsoscelesTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class IsoscelesTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class IsoscelesTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
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 aa9cb2825e5..38092a5e670 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
@@ -67,7 +67,7 @@ class Mammal(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Mammal':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
index aa9cb2825e5..38092a5e670 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mammal.pyi
@@ -67,7 +67,7 @@ class Mammal(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Mammal':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index a1bd29b8efb..be0a7e6fb49 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -54,8 +54,6 @@ class MapTest(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
                             try:
                                 return super().__getitem__(name)
                             except KeyError:
@@ -76,8 +74,6 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -127,8 +123,6 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -158,8 +152,6 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -211,8 +203,6 @@ class MapTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -227,7 +217,7 @@ class MapTest(
         direct_map: typing.Union[MetaOapg.properties.direct_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['StringBooleanMap', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MapTest':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index a1bd29b8efb..be0a7e6fb49 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -54,8 +54,6 @@ class MapTest(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                                return super().__getitem__(name)
                             try:
                                 return super().__getitem__(name)
                             except KeyError:
@@ -76,8 +74,6 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -127,8 +123,6 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -158,8 +152,6 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -211,8 +203,6 @@ class MapTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -227,7 +217,7 @@ class MapTest(
         direct_map: typing.Union[MetaOapg.properties.direct_map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['StringBooleanMap', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MapTest':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index 8f4a9d59aee..ab8574a8c6e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -52,8 +52,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -95,8 +93,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -110,7 +106,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         dateTime: typing.Union[MetaOapg.properties.dateTime, datetime, str, schemas.Unset] = schemas.unset,
         map: typing.Union[MetaOapg.properties.map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index 8f4a9d59aee..ab8574a8c6e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -52,8 +52,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -95,8 +93,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -110,7 +106,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         dateTime: typing.Union[MetaOapg.properties.dateTime, datetime, str, schemas.Unset] = schemas.unset,
         map: typing.Union[MetaOapg.properties.map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
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 a75cba75083..611aca4054b 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
@@ -57,8 +57,6 @@ class Model200Response(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -70,7 +68,7 @@ class Model200Response(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         name: typing.Union[MetaOapg.properties.name, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Model200Response':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index a75cba75083..611aca4054b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -57,8 +57,6 @@ class Model200Response(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -70,7 +68,7 @@ class Model200Response(
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         name: typing.Union[MetaOapg.properties.name, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Model200Response':
         return super().__new__(
             cls,
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 2f389a3befd..26d98fc839e 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
@@ -51,8 +51,6 @@ class ModelReturn(
     
     def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -63,7 +61,7 @@ class ModelReturn(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ModelReturn':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index 2f389a3befd..26d98fc839e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -51,8 +51,6 @@ class ModelReturn(
     
     def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -63,7 +61,7 @@ class ModelReturn(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ModelReturn':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 7298a7a920e..1cc105b7d59 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -63,8 +63,6 @@ class Money(
     
     def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -77,7 +75,7 @@ class Money(
         amount: typing.Union[MetaOapg.properties.amount, str, ],
         currency: 'Currency',
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Money':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 7298a7a920e..1cc105b7d59 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -63,8 +63,6 @@ class Money(
     
     def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -77,7 +75,7 @@ class Money(
         amount: typing.Union[MetaOapg.properties.amount, str, ],
         currency: 'Currency',
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Money':
         return super().__new__(
             cls,
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 84c27b0e017..678d10714fa 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
@@ -66,8 +66,6 @@ class Name(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -80,7 +78,7 @@ class Name(
         name: typing.Union[MetaOapg.properties.name, int, ],
         snake_case: typing.Union[MetaOapg.properties.snake_case, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Name':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 84c27b0e017..678d10714fa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -66,8 +66,6 @@ class Name(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -80,7 +78,7 @@ class Name(
         name: typing.Union[MetaOapg.properties.name, int, ],
         snake_case: typing.Union[MetaOapg.properties.snake_case, int, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Name':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index d8056590f51..36eae4ffbea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -56,8 +56,6 @@ class NoAdditionalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index d8056590f51..36eae4ffbea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -56,8 +56,6 @@ class NoAdditionalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 72d129f4aa1..e92faf24fed 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
@@ -212,7 +212,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'items':
                             return super().__new__(
                                 cls,
@@ -255,7 +255,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'items':
                             return super().__new__(
                                 cls,
@@ -294,8 +294,6 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -340,7 +338,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
@@ -352,8 +350,6 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -394,7 +390,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
@@ -405,8 +401,6 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -453,7 +447,7 @@ class NullableClass(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'additional_properties':
                 return super().__new__(
                     cls,
@@ -516,8 +510,6 @@ class NullableClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index 72d129f4aa1..e92faf24fed 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -212,7 +212,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'items':
                             return super().__new__(
                                 cls,
@@ -255,7 +255,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'items':
                             return super().__new__(
                                 cls,
@@ -294,8 +294,6 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -340,7 +338,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
@@ -352,8 +350,6 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -394,7 +390,7 @@ class NullableClass(
                             cls,
                             *args: typing.Union[dict, frozendict.frozendict, None, ],
                             _configuration: typing.Optional[schemas.Configuration] = None,
-                            **kwargs,
+                            **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                         ) -> 'additional_properties':
                             return super().__new__(
                                 cls,
@@ -405,8 +401,6 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
                     try:
                         return super().__getitem__(name)
                     except KeyError:
@@ -453,7 +447,7 @@ class NullableClass(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'additional_properties':
                 return super().__new__(
                     cls,
@@ -516,8 +510,6 @@ class NullableClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 a66530b1ac0..ce47cc03739 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
@@ -59,7 +59,7 @@ class NullableShape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NullableShape':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
index a66530b1ac0..ce47cc03739 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_shape.pyi
@@ -59,7 +59,7 @@ class NullableShape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NullableShape':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 5604c9bcc84..0ac36e92f84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -49,8 +49,6 @@ class NumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class NumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         JustNumber: typing.Union[MetaOapg.properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 5604c9bcc84..0ac36e92f84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -49,8 +49,6 @@ class NumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class NumberOnly(
         *args: typing.Union[dict, frozendict.frozendict, ],
         JustNumber: typing.Union[MetaOapg.properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index 63c9979af9b..aa05e56190a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -67,8 +67,6 @@ class ObjectModelWithRefProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -82,7 +80,7 @@ class ObjectModelWithRefProps(
         myString: typing.Union[MetaOapg.properties.myString, str, schemas.Unset] = schemas.unset,
         myBoolean: typing.Union[MetaOapg.properties.myBoolean, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index 63c9979af9b..aa05e56190a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -67,8 +67,6 @@ class ObjectModelWithRefProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -82,7 +80,7 @@ class ObjectModelWithRefProps(
         myString: typing.Union[MetaOapg.properties.myString, str, schemas.Unset] = schemas.unset,
         myBoolean: typing.Union[MetaOapg.properties.myBoolean, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index f67ae71d2b7..865ce7bd951 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -65,8 +65,6 @@ class ObjectWithDecimalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -80,7 +78,7 @@ class ObjectWithDecimalProperties(
         width: typing.Union[MetaOapg.properties.width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['Money', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index f67ae71d2b7..865ce7bd951 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -65,8 +65,6 @@ class ObjectWithDecimalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -80,7 +78,7 @@ class ObjectWithDecimalProperties(
         width: typing.Union[MetaOapg.properties.width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['Money', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index 483bd34d69b..d40424aa5de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -63,8 +63,6 @@ class ObjectWithDifficultlyNamedProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class ObjectWithDifficultlyNamedProps(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index 483bd34d69b..d40424aa5de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -63,8 +63,6 @@ class ObjectWithDifficultlyNamedProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class ObjectWithDifficultlyNamedProps(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
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 f83ca758e86..b0ca8939a64 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
@@ -72,7 +72,7 @@ class ObjectWithInlineCompositionProperty(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -94,8 +94,6 @@ class ObjectWithInlineCompositionProperty(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -107,7 +105,7 @@ class ObjectWithInlineCompositionProperty(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index ded283243c7..88cc8239e62 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -69,7 +69,7 @@ class ObjectWithInlineCompositionProperty(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -91,8 +91,6 @@ class ObjectWithInlineCompositionProperty(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -104,7 +102,7 @@ class ObjectWithInlineCompositionProperty(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
index 4aee2ba04a7..755a0dda7ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.py
@@ -39,7 +39,7 @@ class ObjectWithValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
index 106950e9092..c393cea4bbb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_validations.pyi
@@ -38,7 +38,7 @@ class ObjectWithValidations(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index bf1d3b168de..2a496386ed8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -105,8 +105,6 @@ class Order(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -123,7 +121,7 @@ class Order(
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         complete: typing.Union[MetaOapg.properties.complete, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Order':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index bf1d3b168de..2a496386ed8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -105,8 +105,6 @@ class Order(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -123,7 +121,7 @@ class Order(
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         complete: typing.Union[MetaOapg.properties.complete, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Order':
         return super().__new__(
             cls,
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 b704664323b..3d682113c67 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
@@ -64,7 +64,7 @@ class ParentPet(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ParentPet':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
index b704664323b..3d682113c67 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/parent_pet.pyi
@@ -64,7 +64,7 @@ class ParentPet(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ParentPet':
         return super().__new__(
             cls,
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 a6f24ed36f5..64e97bee914 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
@@ -163,8 +163,6 @@ class Pet(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -181,7 +179,7 @@ class Pet(
         tags: typing.Union[MetaOapg.properties.tags, tuple, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Pet':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index a6f24ed36f5..64e97bee914 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -163,8 +163,6 @@ class Pet(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -181,7 +179,7 @@ class Pet(
         tags: typing.Union[MetaOapg.properties.tags, tuple, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Pet':
         return super().__new__(
             cls,
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 4bfaedcac41..a01cccf5d02 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
@@ -65,7 +65,7 @@ class Pig(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Pig':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
index 4bfaedcac41..a01cccf5d02 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pig.pyi
@@ -65,7 +65,7 @@ class Pig(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Pig':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 6d9089c7b21..5b22fd2af25 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -61,8 +61,6 @@ class Player(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class Player(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Player':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 6d9089c7b21..5b22fd2af25 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -61,8 +61,6 @@ class Player(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class Player(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Player':
         return super().__new__(
             cls,
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 0f97215e018..e5860151b2b 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
@@ -65,7 +65,7 @@ class Quadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
index 0f97215e018..e5860151b2b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral.pyi
@@ -65,7 +65,7 @@ class Quadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
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 12bf6d8938e..ac8a411c304 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
@@ -74,8 +74,6 @@ class QuadrilateralInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -88,7 +86,7 @@ class QuadrilateralInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 12bf6d8938e..ac8a411c304 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -74,8 +74,6 @@ class QuadrilateralInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -88,7 +86,7 @@ class QuadrilateralInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index 550e0f25410..dafa4463317 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -55,8 +55,6 @@ class ReadOnlyFirst(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -69,7 +67,7 @@ class ReadOnlyFirst(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         baz: typing.Union[MetaOapg.properties.baz, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index 550e0f25410..dafa4463317 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -55,8 +55,6 @@ class ReadOnlyFirst(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -69,7 +67,7 @@ class ReadOnlyFirst(
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         baz: typing.Union[MetaOapg.properties.baz, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
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 8369141ef7c..087362c7359 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
@@ -71,8 +71,6 @@ class ScaleneTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class ScaleneTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class ScaleneTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 8369141ef7c..087362c7359 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -71,8 +71,6 @@ class ScaleneTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class ScaleneTriangle(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 triangleType: typing.Union[MetaOapg.properties.triangleType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class ScaleneTriangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
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 877013b205f..5ea0274945c 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
@@ -65,7 +65,7 @@ class Shape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Shape':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
index 877013b205f..5ea0274945c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape.pyi
@@ -65,7 +65,7 @@ class Shape(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Shape':
         return super().__new__(
             cls,
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 68d87005875..e8aa9a061aa 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
@@ -69,7 +69,7 @@ class ShapeOrNull(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
index 68d87005875..e8aa9a061aa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/shape_or_null.pyi
@@ -69,7 +69,7 @@ class ShapeOrNull(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
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 19338945b09..db111f5b789 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
@@ -71,8 +71,6 @@ class SimpleQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class SimpleQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class SimpleQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index 19338945b09..db111f5b789 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -71,8 +71,6 @@ class SimpleQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
                 try:
                     return super().__getitem__(name)
                 except KeyError:
@@ -84,7 +82,7 @@ class SimpleQuadrilateral(
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs,
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,7 +113,7 @@ class SimpleQuadrilateral(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
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 7680d810446..4ecc06acf2b 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
@@ -54,7 +54,7 @@ class SomeObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SomeObject':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
index 7680d810446..4ecc06acf2b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/some_object.pyi
@@ -54,7 +54,7 @@ class SomeObject(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SomeObject':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index f4a8385b73d..a5daccbe96f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -51,8 +51,6 @@ class SpecialModelName(
     
     def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -64,7 +62,7 @@ class SpecialModelName(
         *args: typing.Union[dict, frozendict.frozendict, ],
         a: typing.Union[MetaOapg.properties.a, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index f4a8385b73d..a5daccbe96f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -51,8 +51,6 @@ class SpecialModelName(
     
     def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -64,7 +62,7 @@ class SpecialModelName(
         *args: typing.Union[dict, frozendict.frozendict, ],
         a: typing.Union[MetaOapg.properties.a, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
index 8b257635f9f..ccbd9fb2f56 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
@@ -37,8 +37,6 @@ class StringBooleanMap(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
index 8b257635f9f..ccbd9fb2f56 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
@@ -37,8 +37,6 @@ class StringBooleanMap(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index dcc876507a9..677e12aa413 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -55,8 +55,6 @@ class Tag(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -69,7 +67,7 @@ class Tag(
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Tag':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index dcc876507a9..677e12aa413 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -55,8 +55,6 @@ class Tag(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -69,7 +67,7 @@ class Tag(
         id: typing.Union[MetaOapg.properties.id, int, schemas.Unset] = schemas.unset,
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Tag':
         return super().__new__(
             cls,
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 5cc130e6564..ebfff979a70 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
@@ -67,7 +67,7 @@ class Triangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Triangle':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
index 5cc130e6564..ebfff979a70 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle.pyi
@@ -67,7 +67,7 @@ class Triangle(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Triangle':
         return super().__new__(
             cls,
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 12456085b37..9d007664b66 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
@@ -74,8 +74,6 @@ class TriangleInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -88,7 +86,7 @@ class TriangleInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         triangleType: typing.Union[MetaOapg.properties.triangleType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index 12456085b37..9d007664b66 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -74,8 +74,6 @@ class TriangleInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -88,7 +86,7 @@ class TriangleInterface(
         shapeType: typing.Union[MetaOapg.properties.shapeType, str, ],
         triangleType: typing.Union[MetaOapg.properties.triangleType, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
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 84f9b44377b..de4c6782572 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,7 +58,7 @@ class User(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, None, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'objectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
@@ -82,7 +82,7 @@ class User(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'anyTypeExceptNullProp':
                     return super().__new__(
                         cls,
@@ -165,8 +165,6 @@ class User(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -190,7 +188,7 @@ class User(
         anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'User':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index 84f9b44377b..de4c6782572 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -58,7 +58,7 @@ class User(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, None, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'objectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
@@ -82,7 +82,7 @@ class User(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'anyTypeExceptNullProp':
                     return super().__new__(
                         cls,
@@ -165,8 +165,6 @@ class User(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -190,7 +188,7 @@ class User(
         anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'User':
         return super().__new__(
             cls,
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 778f85f245b..07e429e3644 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
@@ -78,8 +78,6 @@ class Whale(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -93,7 +91,7 @@ class Whale(
         hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, bool, schemas.Unset] = schemas.unset,
         hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Whale':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index 778f85f245b..07e429e3644 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -78,8 +78,6 @@ class Whale(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -93,7 +91,7 @@ class Whale(
         hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, bool, schemas.Unset] = schemas.unset,
         hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, bool, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Whale':
         return super().__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 339014133f4..36e84efca58 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
@@ -99,8 +99,6 @@ class Zebra(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
index 339014133f4..36e84efca58 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
@@ -99,8 +99,6 @@ class Zebra(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 20080675e53..4463663ce61 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
@@ -209,8 +209,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -234,7 +232,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         password: typing.Union[MetaOapg.properties.password, str, schemas.Unset] = schemas.unset,
         callback: typing.Union[MetaOapg.properties.callback, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index b1f3999c8bd..581de743da9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -171,8 +171,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -196,7 +194,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         password: typing.Union[MetaOapg.properties.password, str, schemas.Unset] = schemas.unset,
         callback: typing.Union[MetaOapg.properties.callback, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
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 62a5f90e251..b72fa57998a 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
@@ -382,8 +382,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -396,7 +394,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, tuple, schemas.Unset] = schemas.unset,
         enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 4345fa77230..0c47a72011c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -306,8 +306,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -320,7 +318,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, tuple, schemas.Unset] = schemas.unset,
         enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
index 9ef959cdb23..e186156acf1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
@@ -38,8 +38,6 @@ class SchemaForRequestBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
index e57eedf66bb..9e1d529a985 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
@@ -36,8 +36,6 @@ class SchemaForRequestBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 06f7cc2d795..ab62ffcb6aa 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
@@ -64,7 +64,7 @@ class CompositionAtRootSchema(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'CompositionAtRootSchema':
         return super().__new__(
             cls,
@@ -119,7 +119,7 @@ class CompositionInPropertySchema(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -141,8 +141,6 @@ class CompositionInPropertySchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -154,7 +152,7 @@ class CompositionInPropertySchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'CompositionInPropertySchema':
         return super().__new__(
             cls,
@@ -233,7 +231,7 @@ class SchemaForRequestBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
@@ -288,7 +286,7 @@ class SchemaForRequestBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -310,8 +308,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -323,7 +319,7 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -380,7 +376,7 @@ class SchemaFor200ResponseBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
@@ -435,7 +431,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -457,8 +453,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -470,7 +464,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 1ccc16b23a6..8d3fe0ec0ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -59,7 +59,7 @@ class CompositionAtRootSchema(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'CompositionAtRootSchema':
         return super().__new__(
             cls,
@@ -111,7 +111,7 @@ class CompositionInPropertySchema(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -133,8 +133,6 @@ class CompositionInPropertySchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -146,7 +144,7 @@ class CompositionInPropertySchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'CompositionInPropertySchema':
         return super().__new__(
             cls,
@@ -191,7 +189,7 @@ class SchemaForRequestBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
@@ -243,7 +241,7 @@ class SchemaForRequestBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -265,8 +263,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -278,7 +274,7 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
@@ -322,7 +318,7 @@ class SchemaFor200ResponseBodyApplicationJson(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
@@ -374,7 +370,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
                     cls,
                     *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                     _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs,
+                    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
                 ) -> 'someProp':
                     return super().__new__(
                         cls,
@@ -396,8 +392,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -409,7 +403,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         someProp: typing.Union[MetaOapg.properties.someProp, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index 07bf8e63386..5d1bbc1bbdc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -60,8 +60,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -74,7 +72,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         param: typing.Union[MetaOapg.properties.param, str, ],
         param2: typing.Union[MetaOapg.properties.param2, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 9275d59ca09..51beee1ed34 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -58,8 +58,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -72,7 +70,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         param: typing.Union[MetaOapg.properties.param, str, ],
         param2: typing.Union[MetaOapg.properties.param2, str, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index 78b9165f8f4..71e43990fa8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -49,8 +49,6 @@ class MapBeanSchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -62,7 +60,7 @@ class MapBeanSchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         keyword: typing.Union[MetaOapg.properties.keyword, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MapBeanSchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index 9289ae39300..edeca906df6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -47,8 +47,6 @@ class MapBeanSchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -60,7 +58,7 @@ class MapBeanSchema(
         *args: typing.Union[dict, frozendict.frozendict, ],
         keyword: typing.Union[MetaOapg.properties.keyword, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MapBeanSchema':
         return super().__new__(
             cls,
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 e7a9260322f..5e9d932e845 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
@@ -87,8 +87,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -101,7 +99,7 @@ class SchemaForRequestBodyMultipartFormData(
         requiredFile: typing.Union[MetaOapg.properties.requiredFile, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index 1284d63fe93..8c417e784c1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -61,8 +61,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class SchemaForRequestBodyMultipartFormData(
         requiredFile: typing.Union[MetaOapg.properties.requiredFile, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
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 ccad7cab618..6b3a29695da 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
@@ -61,8 +61,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -75,7 +73,7 @@ class SchemaForRequestBodyMultipartFormData(
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index 65174318dad..1ff8e580a71 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -59,8 +59,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -73,7 +71,7 @@ class SchemaForRequestBodyMultipartFormData(
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, ],
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__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 ed82c99a37e..b38e3b86547 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
@@ -74,8 +74,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -87,7 +85,7 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 40d4c911a83..0298e587c77 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -72,8 +72,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -85,7 +83,7 @@ class SchemaForRequestBodyMultipartFormData(
         *args: typing.Union[dict, frozendict.frozendict, ],
         files: typing.Union[MetaOapg.properties.files, tuple, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index 1450fed335a..d133227159b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -55,8 +55,6 @@ class SchemaFor0ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -68,7 +66,7 @@ class SchemaFor0ResponseBodyApplicationJson(
         *args: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['Foo', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor0ResponseBodyApplicationJson':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index f429c2f2aaa..4aa4fce4d50 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -53,8 +53,6 @@ class SchemaFor0ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -66,7 +64,7 @@ class SchemaFor0ResponseBodyApplicationJson(
         *args: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['Foo', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor0ResponseBodyApplicationJson':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index 51fd511afc7..2231c7f9d26 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -82,8 +82,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -96,7 +94,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index 78a1535e1a4..bbab7228532 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -56,8 +56,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -70,7 +68,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
         name: typing.Union[MetaOapg.properties.name, str, schemas.Unset] = schemas.unset,
         status: typing.Union[MetaOapg.properties.status, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 23598348b41..0a51db2a4de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -84,8 +84,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -98,7 +96,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 6c45ff35e49..1e954cd8da1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -58,8 +58,6 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
@@ -72,7 +70,7 @@ class SchemaForRequestBodyMultipartFormData(
         additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, str, schemas.Unset] = schemas.unset,
         file: typing.Union[MetaOapg.properties.file, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyMultipartFormData':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
index 2d8cf3a1514..ea7343d866d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
@@ -40,8 +40,6 @@ class SchemaFor200ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
index 25a36b095c7..9c8af294789 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
@@ -35,8 +35,6 @@ class SchemaFor200ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
         try:
             return super().__getitem__(name)
         except KeyError:
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 8b176df7993..8a873a29ece 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -2187,6 +2187,13 @@ class DictSchema(
     def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
         return super().__new__(cls, *args, **kwargs)
 
+    def __getitem__(self, name: str):
+        # dict_instance[name] accessor
+        try:
+            return super().__getitem__(name)
+        except KeyError:
+            return unset
+
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema}
 
-- 
GitLab


From 68238cbc211bf782a18be3b46bf5d26be7debffd Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 00:45:02 -0700
Subject: [PATCH 15/30] Simplifies method calls

---
 ..._getitems_with_addprops_getitem.handlebars |  5 +--
 ...perty_getitems_without_addprops.handlebars |  5 +--
 .../python-experimental/schemas.handlebars    | 42 ++++++++++++-------
 .../model/additional_properties_class.py      | 30 +++----------
 .../model/additional_properties_class.pyi     | 30 +++----------
 ...ditional_properties_with_array_of_enums.py |  5 +--
 ...itional_properties_with_array_of_enums.pyi |  5 +--
 .../petstore_api/model/address.py             |  5 +--
 .../petstore_api/model/address.pyi            |  5 +--
 .../petstore_api/model/animal.py              |  5 +--
 .../petstore_api/model/animal.pyi             |  5 +--
 .../petstore_api/model/api_response.py        |  5 +--
 .../petstore_api/model/api_response.pyi       |  5 +--
 .../petstore_api/model/apple.py               |  5 +--
 .../petstore_api/model/apple.pyi              |  5 +--
 .../petstore_api/model/apple_req.py           |  5 +--
 .../petstore_api/model/apple_req.pyi          |  5 +--
 .../model/array_of_array_of_number_only.py    |  5 +--
 .../model/array_of_array_of_number_only.pyi   |  5 +--
 .../model/array_of_number_only.py             |  5 +--
 .../model/array_of_number_only.pyi            |  5 +--
 .../petstore_api/model/array_test.py          |  5 +--
 .../petstore_api/model/array_test.pyi         |  5 +--
 .../petstore_api/model/banana.py              |  5 +--
 .../petstore_api/model/banana.pyi             |  5 +--
 .../petstore_api/model/banana_req.py          |  5 +--
 .../petstore_api/model/banana_req.pyi         |  5 +--
 .../petstore_api/model/basque_pig.py          |  5 +--
 .../petstore_api/model/basque_pig.pyi         |  5 +--
 .../petstore_api/model/capitalization.py      |  5 +--
 .../petstore_api/model/capitalization.pyi     |  5 +--
 .../petstore_api/model/cat.py                 |  5 +--
 .../petstore_api/model/cat.pyi                |  5 +--
 .../petstore_api/model/category.py            |  5 +--
 .../petstore_api/model/category.pyi           |  5 +--
 .../petstore_api/model/child_cat.py           |  5 +--
 .../petstore_api/model/child_cat.pyi          |  5 +--
 .../petstore_api/model/class_model.py         |  5 +--
 .../petstore_api/model/class_model.pyi        |  5 +--
 .../petstore_api/model/client.py              |  5 +--
 .../petstore_api/model/client.pyi             |  5 +--
 .../model/complex_quadrilateral.py            |  5 +--
 .../model/complex_quadrilateral.pyi           |  5 +--
 .../petstore_api/model/danish_pig.py          |  5 +--
 .../petstore_api/model/danish_pig.pyi         |  5 +--
 .../petstore_api/model/dog.py                 |  5 +--
 .../petstore_api/model/dog.pyi                |  5 +--
 .../petstore_api/model/drawing.py             |  5 +--
 .../petstore_api/model/drawing.pyi            |  5 +--
 .../petstore_api/model/enum_arrays.py         |  5 +--
 .../petstore_api/model/enum_arrays.pyi        |  5 +--
 .../petstore_api/model/enum_test.py           |  5 +--
 .../petstore_api/model/enum_test.pyi          |  5 +--
 .../model/equilateral_triangle.py             |  5 +--
 .../model/equilateral_triangle.pyi            |  5 +--
 .../petstore_api/model/file.py                |  5 +--
 .../petstore_api/model/file.pyi               |  5 +--
 .../model/file_schema_test_class.py           |  5 +--
 .../model/file_schema_test_class.pyi          |  5 +--
 .../petstore_api/model/foo.py                 |  5 +--
 .../petstore_api/model/foo.pyi                |  5 +--
 .../petstore_api/model/format_test.py         |  5 +--
 .../petstore_api/model/format_test.pyi        |  5 +--
 .../petstore_api/model/fruit.py               |  5 +--
 .../petstore_api/model/fruit.pyi              |  5 +--
 .../petstore_api/model/gm_fruit.py            |  5 +--
 .../petstore_api/model/gm_fruit.pyi           |  5 +--
 .../petstore_api/model/grandparent_animal.py  |  5 +--
 .../petstore_api/model/grandparent_animal.pyi |  5 +--
 .../petstore_api/model/has_only_read_only.py  |  5 +--
 .../petstore_api/model/has_only_read_only.pyi |  5 +--
 .../petstore_api/model/health_check_result.py |  5 +--
 .../model/health_check_result.pyi             |  5 +--
 .../petstore_api/model/isosceles_triangle.py  |  5 +--
 .../petstore_api/model/isosceles_triangle.pyi |  5 +--
 .../petstore_api/model/map_test.py            | 25 +++--------
 .../petstore_api/model/map_test.pyi           | 25 +++--------
 ...perties_and_additional_properties_class.py | 10 +----
 ...erties_and_additional_properties_class.pyi | 10 +----
 .../petstore_api/model/model200_response.py   |  5 +--
 .../petstore_api/model/model200_response.pyi  |  5 +--
 .../petstore_api/model/model_return.py        |  5 +--
 .../petstore_api/model/model_return.pyi       |  5 +--
 .../petstore_api/model/money.py               |  5 +--
 .../petstore_api/model/money.pyi              |  5 +--
 .../petstore_api/model/name.py                |  5 +--
 .../petstore_api/model/name.pyi               |  5 +--
 .../model/no_additional_properties.py         |  5 +--
 .../model/no_additional_properties.pyi        |  5 +--
 .../petstore_api/model/nullable_class.py      | 20 ++-------
 .../petstore_api/model/nullable_class.pyi     | 20 ++-------
 .../petstore_api/model/number_only.py         |  5 +--
 .../petstore_api/model/number_only.pyi        |  5 +--
 .../model/object_model_with_ref_props.py      |  5 +--
 .../model/object_model_with_ref_props.pyi     |  5 +--
 .../model/object_with_decimal_properties.py   |  5 +--
 .../model/object_with_decimal_properties.pyi  |  5 +--
 .../object_with_difficultly_named_props.py    |  5 +--
 .../object_with_difficultly_named_props.pyi   |  5 +--
 ...object_with_inline_composition_property.py |  5 +--
 ...bject_with_inline_composition_property.pyi |  5 +--
 .../petstore_api/model/order.py               |  5 +--
 .../petstore_api/model/order.pyi              |  5 +--
 .../petstore_api/model/pet.py                 |  5 +--
 .../petstore_api/model/pet.pyi                |  5 +--
 .../petstore_api/model/player.py              |  5 +--
 .../petstore_api/model/player.pyi             |  5 +--
 .../model/quadrilateral_interface.py          |  5 +--
 .../model/quadrilateral_interface.pyi         |  5 +--
 .../petstore_api/model/read_only_first.py     |  5 +--
 .../petstore_api/model/read_only_first.pyi    |  5 +--
 .../petstore_api/model/scalene_triangle.py    |  5 +--
 .../petstore_api/model/scalene_triangle.pyi   |  5 +--
 .../model/simple_quadrilateral.py             |  5 +--
 .../model/simple_quadrilateral.pyi            |  5 +--
 .../petstore_api/model/special_model_name.py  |  5 +--
 .../petstore_api/model/special_model_name.pyi |  5 +--
 .../petstore_api/model/string_boolean_map.py  |  5 +--
 .../petstore_api/model/string_boolean_map.pyi |  5 +--
 .../petstore_api/model/tag.py                 |  5 +--
 .../petstore_api/model/tag.pyi                |  5 +--
 .../petstore_api/model/triangle_interface.py  |  5 +--
 .../petstore_api/model/triangle_interface.pyi |  5 +--
 .../petstore_api/model/user.py                |  5 +--
 .../petstore_api/model/user.pyi               |  5 +--
 .../petstore_api/model/whale.py               |  5 +--
 .../petstore_api/model/whale.pyi              |  5 +--
 .../petstore_api/model/zebra.py               |  5 +--
 .../petstore_api/model/zebra.pyi              |  5 +--
 .../petstore_api/paths/fake_1/post.py         |  5 +--
 .../petstore_api/paths/fake_1/post.pyi        |  5 +--
 .../petstore_api/paths/fake_2/get.py          |  5 +--
 .../petstore_api/paths/fake_2/get.pyi         |  5 +--
 .../fake_inline_additional_properties/post.py |  5 +--
 .../post.pyi                                  |  5 +--
 .../paths/fake_inline_composition_/post.py    | 15 ++-----
 .../paths/fake_inline_composition_/post.pyi   | 15 ++-----
 .../paths/fake_json_form_data/get.py          |  5 +--
 .../paths/fake_json_form_data/get.pyi         |  5 +--
 .../paths/fake_obj_in_query/get.py            |  5 +--
 .../paths/fake_obj_in_query/get.pyi           |  5 +--
 .../post.py                                   |  5 +--
 .../post.pyi                                  |  5 +--
 .../paths/fake_upload_file/post.py            |  5 +--
 .../paths/fake_upload_file/post.pyi           |  5 +--
 .../paths/fake_upload_files/post.py           |  5 +--
 .../paths/fake_upload_files/post.pyi          |  5 +--
 .../petstore_api/paths/foo/get.py             |  5 +--
 .../petstore_api/paths/foo/get.pyi            |  5 +--
 .../petstore_api/paths/pet_pet_id_3/post.py   |  5 +--
 .../petstore_api/paths/pet_pet_id_3/post.pyi  |  5 +--
 .../paths/pet_pet_id_upload_image/post.py     |  5 +--
 .../paths/pet_pet_id_upload_image/post.pyi    |  5 +--
 .../petstore_api/paths/store_inventory/get.py |  5 +--
 .../paths/store_inventory/get.pyi             |  5 +--
 .../petstore_api/schemas.py                   | 42 ++++++++++++-------
 .../tests_manual/test_gm_fruit.py             | 21 ++++++----
 157 files changed, 251 insertions(+), 774 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
index 0b732f454ed..54977796ed7 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
@@ -1,6 +1,3 @@
 def __getitem__(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
     # dict_instance[name] accessor
-    try:
-        return super().__getitem__(name)
-    except KeyError:
-        return schemas.unset
+    return super().__getitem__(name)
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
index e31ed3c1962..233d634d158 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
@@ -18,9 +18,6 @@ def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.
 
 def __getitem__(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
     # dict_instance[name] accessor
-    try:
-        return super().__getitem__(name)
-    except KeyError:
-        return schemas.unset
+    return super().__getitem__(name)
 
 {{/if}}
\ No newline at end of file
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 4503ca9bc96..ec48462219d 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -1564,14 +1564,33 @@ class DictBase(Discriminable, ValidatorBase):
             raise AttributeError('property setting not supported on immutable instances')
 
     def __getattr__(self, name: str):
-        # for instance.name access
-        if isinstance(self, frozendict.frozendict):
-            # if an attribute does not exist
-            try:
-                return self[name]
-            except KeyError as ex:
-                raise AttributeError(str(ex))
-        return super().__getattr__(self, name)
+        """
+        for instance.name access
+
+        For type hints to accurately show that properties are optional
+        - values that do not exist in the dict but are present in properties must NOT throw AttributeError
+        - values that are not known about can throw AttributeErrors
+        """
+        if not isinstance(self, frozendict.frozendict):
+            return super().__getattr__(name)
+        # if an attribute does not exist
+        attribute_error = AttributeError(f"'{self}' has no attribute '{name}'")
+        try:
+            value = self[name]
+        except KeyError as _ex:
+            raise attribute_error
+        return value
+
+    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+        # dict_instance[name] accessor
+        if not isinstance(self, frozendict.frozendict):
+            return super().__getattr__(name)
+        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+            return super().__getitem__(name)
+        try:
+            return super().__getitem__(name)
+        except KeyError:
+            return unset
 
 
 def cast_to_allowed_types(
@@ -2180,13 +2199,6 @@ class DictSchema(
     def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
         return super().__new__(cls, *args, **kwargs)
 
-    def __getitem__(self, name: str):
-        # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return unset
-
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema}
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 5208f34c796..a8b07db6058 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -46,10 +46,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -83,10 +80,7 @@ class AdditionalPropertiesClass(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            return super().__getitem__(name)
                     
                         def __new__(
                             cls,
@@ -103,10 +97,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -135,10 +126,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -184,10 +172,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -250,10 +235,7 @@ class AdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 5208f34c796..a8b07db6058 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -46,10 +46,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -83,10 +80,7 @@ class AdditionalPropertiesClass(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            return super().__getitem__(name)
                     
                         def __new__(
                             cls,
@@ -103,10 +97,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -135,10 +126,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -184,10 +172,7 @@ class AdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -250,10 +235,7 @@ class AdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 919595896e5..8e2e2a9f5da 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
@@ -63,10 +63,7 @@ class AdditionalPropertiesWithArrayOfEnums(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
index 919595896e5..8e2e2a9f5da 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
@@ -63,10 +63,7 @@ class AdditionalPropertiesWithArrayOfEnums(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
index 525ef854c2b..a6b021e6b84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
@@ -37,10 +37,7 @@ class Address(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
index 525ef854c2b..a6b021e6b84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
@@ -37,10 +37,7 @@ class Address(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 4c881004297..46cf9136575 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -68,10 +68,7 @@ class Animal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 4c881004297..46cf9136575 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -68,10 +68,7 @@ class Animal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index e95971a2569..b33f10fcf79 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -61,10 +61,7 @@ class ApiResponse(
     
     def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index e95971a2569..b33f10fcf79 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -61,10 +61,7 @@ class ApiResponse(
     
     def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 a28c1afd2a9..d4b7e743195 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
@@ -86,10 +86,7 @@ class Apple(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index b9919237a64..5600f43ee6f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -73,10 +73,7 @@ class Apple(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index b26f1e7fe7a..c12df46aad6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -56,10 +56,7 @@ class AppleReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index b26f1e7fe7a..c12df46aad6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -56,10 +56,7 @@ class AppleReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
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 8cc51c1948a..af4102c23ee 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
@@ -93,10 +93,7 @@ class ArrayOfArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index 8cc51c1948a..af4102c23ee 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -93,10 +93,7 @@ class ArrayOfArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 7c90d24c25c..4c15cd2ffc9 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
@@ -71,10 +71,7 @@ class ArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 7c90d24c25c..4c15cd2ffc9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -71,10 +71,7 @@ class ArrayOfNumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 a7dbd857444..71d18a90881 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
@@ -175,10 +175,7 @@ class ArrayTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index a7dbd857444..71d18a90881 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -175,10 +175,7 @@ class ArrayTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index 21f802cfe04..0afb6ebc675 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -52,10 +52,7 @@ class Banana(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index 21f802cfe04..0afb6ebc675 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -52,10 +52,7 @@ class Banana(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 0dc6b0e25a6..150efd2b437 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -56,10 +56,7 @@ class BananaReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 0dc6b0e25a6..150efd2b437 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -56,10 +56,7 @@ class BananaReq(
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index 461e3f3a62f..32a26daa786 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -66,10 +66,7 @@ class BasquePig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index 461e3f3a62f..32a26daa786 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -66,10 +66,7 @@ class BasquePig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index e3dd2b17b52..581ff20af83 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -79,10 +79,7 @@ class Capitalization(
     
     def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index e3dd2b17b52..581ff20af83 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -79,10 +79,7 @@ class Capitalization(
     
     def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 500d766d1ca..3761510eb00 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
@@ -57,10 +57,7 @@ class Cat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index 500d766d1ca..3761510eb00 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -57,10 +57,7 @@ class Cat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
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 973ab8edd14..4f29fe0a9bd 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
@@ -58,10 +58,7 @@ class Category(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index 973ab8edd14..4f29fe0a9bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -58,10 +58,7 @@ class Category(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 b6ba3434542..ef9d8ce779a 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
@@ -57,10 +57,7 @@ class ChildCat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index b6ba3434542..ef9d8ce779a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -57,10 +57,7 @@ class ChildCat(
             
             def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
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 c7d33c62a8f..90e53b43f6e 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
@@ -52,10 +52,7 @@ class ClassModel(
     
     def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index c7d33c62a8f..90e53b43f6e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -52,10 +52,7 @@ class ClassModel(
     
     def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 29581a0f192..7e88c1d2e86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -49,10 +49,7 @@ class Client(
     
     def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 29581a0f192..7e88c1d2e86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -49,10 +49,7 @@ class Client(
     
     def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 0a15285a605..3d9e12c71ec 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
@@ -71,10 +71,7 @@ class ComplexQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 0a15285a605..3d9e12c71ec 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -71,10 +71,7 @@ class ComplexQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index 1c6e0c89c52..04dc60b6204 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -66,10 +66,7 @@ class DanishPig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index 1c6e0c89c52..04dc60b6204 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -66,10 +66,7 @@ class DanishPig(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 b46ddc245a6..9793dd7d2bb 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
@@ -57,10 +57,7 @@ class Dog(
             
             def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index b46ddc245a6..9793dd7d2bb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -57,10 +57,7 @@ class Dog(
             
             def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
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 a738a309638..e9beac8ddd7 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
@@ -110,10 +110,7 @@ class Drawing(
     
     def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
index a738a309638..e9beac8ddd7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
@@ -110,10 +110,7 @@ class Drawing(
     
     def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
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 5b091711e0d..ec6553aa2e4 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
@@ -117,10 +117,7 @@ class EnumArrays(
     
     def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 5b091711e0d..ec6553aa2e4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -117,10 +117,7 @@ class EnumArrays(
     
     def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 da504c2227e..43dc9ed0d40 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
@@ -212,10 +212,7 @@ class EnumTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index da504c2227e..43dc9ed0d40 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -212,10 +212,7 @@ class EnumTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 d6c12fc194d..7149ead37e7 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
@@ -71,10 +71,7 @@ class EquilateralTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index d6c12fc194d..7149ead37e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -71,10 +71,7 @@ class EquilateralTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 28c677be1b2..36470b213a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -51,10 +51,7 @@ class File(
     
     def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 28c677be1b2..36470b213a7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -51,10 +51,7 @@ class File(
     
     def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 939c2979ef9..65e0581b6f1 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
@@ -85,10 +85,7 @@ class FileSchemaTestClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 939c2979ef9..65e0581b6f1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -85,10 +85,7 @@ class FileSchemaTestClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index 5f266595bd2..ee4b52f8ab0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -49,10 +49,7 @@ class Foo(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index 5f266595bd2..ee4b52f8ab0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -49,10 +49,7 @@ class Foo(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 5eeb0092648..6ff20232030 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
@@ -289,10 +289,7 @@ class FormatTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index 41b54489f02..94ca0489a1b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -241,10 +241,7 @@ class FormatTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 83f21cad1af..5511c8b8da6 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
@@ -66,10 +66,7 @@ class Fruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 83f21cad1af..5511c8b8da6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -66,10 +66,7 @@ class Fruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 d8d5d5457a2..215fe6b5a5d 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
@@ -66,10 +66,7 @@ class GmFruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index d8d5d5457a2..215fe6b5a5d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -66,10 +66,7 @@ class GmFruit(
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index adad2549e3b..cbfdde5c730 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -62,10 +62,7 @@ class GrandparentAnimal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index adad2549e3b..cbfdde5c730 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -62,10 +62,7 @@ class GrandparentAnimal(
     
     def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index e419f405be6..b8746de60bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -55,10 +55,7 @@ class HasOnlyReadOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index e419f405be6..b8746de60bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -55,10 +55,7 @@ class HasOnlyReadOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 31c78c27412..afe3f43aea9 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
@@ -71,10 +71,7 @@ class HealthCheckResult(
     
     def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 31c78c27412..afe3f43aea9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -71,10 +71,7 @@ class HealthCheckResult(
     
     def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 08c1c75ce55..70a79a04f7f 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
@@ -71,10 +71,7 @@ class IsoscelesTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index 08c1c75ce55..70a79a04f7f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -71,10 +71,7 @@ class IsoscelesTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index be0a7e6fb49..5c4f092a09e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -54,10 +54,7 @@ class MapTest(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            return super().__getitem__(name)
                     
                         def __new__(
                             cls,
@@ -74,10 +71,7 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -123,10 +117,7 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -152,10 +143,7 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -203,10 +191,7 @@ class MapTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index be0a7e6fb49..5c4f092a09e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -54,10 +54,7 @@ class MapTest(
                         
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
-                            try:
-                                return super().__getitem__(name)
-                            except KeyError:
-                                return schemas.unset
+                            return super().__getitem__(name)
                     
                         def __new__(
                             cls,
@@ -74,10 +71,7 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -123,10 +117,7 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -152,10 +143,7 @@ class MapTest(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -203,10 +191,7 @@ class MapTest(
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index ab8574a8c6e..8a77aa04c91 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -52,10 +52,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -93,10 +90,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index ab8574a8c6e..8a77aa04c91 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -52,10 +52,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -93,10 +90,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 611aca4054b..022f6945603 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
@@ -57,10 +57,7 @@ class Model200Response(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index 611aca4054b..022f6945603 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -57,10 +57,7 @@ class Model200Response(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 26d98fc839e..562588d1dc3 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
@@ -51,10 +51,7 @@ class ModelReturn(
     
     def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index 26d98fc839e..562588d1dc3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -51,10 +51,7 @@ class ModelReturn(
     
     def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 1cc105b7d59..364372e2a44 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -63,10 +63,7 @@ class Money(
     
     def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 1cc105b7d59..364372e2a44 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -63,10 +63,7 @@ class Money(
     
     def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     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 678d10714fa..978ebaa19b0 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
@@ -66,10 +66,7 @@ class Name(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 678d10714fa..978ebaa19b0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -66,10 +66,7 @@ class Name(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 36eae4ffbea..70042463841 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -56,10 +56,7 @@ class NoAdditionalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 36eae4ffbea..70042463841 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -56,10 +56,7 @@ class NoAdditionalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
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 e92faf24fed..b2644be98d9 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
@@ -294,10 +294,7 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -350,10 +347,7 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -401,10 +395,7 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -510,10 +501,7 @@ class NullableClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index e92faf24fed..b2644be98d9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -294,10 +294,7 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -350,10 +347,7 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -401,10 +395,7 @@ class NullableClass(
                 
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
+                    return super().__getitem__(name)
             
                 def __new__(
                     cls,
@@ -510,10 +501,7 @@ class NullableClass(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 0ac36e92f84..f2e5ba29ed6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -49,10 +49,7 @@ class NumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 0ac36e92f84..f2e5ba29ed6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -49,10 +49,7 @@ class NumberOnly(
     
     def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index aa05e56190a..d743c9fec0e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -67,10 +67,7 @@ class ObjectModelWithRefProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index aa05e56190a..d743c9fec0e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -67,10 +67,7 @@ class ObjectModelWithRefProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index 865ce7bd951..f3392173c0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -65,10 +65,7 @@ class ObjectWithDecimalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index 865ce7bd951..f3392173c0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -65,10 +65,7 @@ class ObjectWithDecimalProperties(
     
     def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index d40424aa5de..d766625653e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -63,10 +63,7 @@ class ObjectWithDifficultlyNamedProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index d40424aa5de..d766625653e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -63,10 +63,7 @@ class ObjectWithDifficultlyNamedProps(
     
     def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 b0ca8939a64..75317e02efb 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
@@ -94,10 +94,7 @@ class ObjectWithInlineCompositionProperty(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 88cc8239e62..93b7e4d24c5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -91,10 +91,7 @@ class ObjectWithInlineCompositionProperty(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index 2a496386ed8..aa876471e89 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -105,10 +105,7 @@ class Order(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index 2a496386ed8..aa876471e89 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -105,10 +105,7 @@ class Order(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 64e97bee914..7e8b729b2ef 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
@@ -163,10 +163,7 @@ class Pet(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index 64e97bee914..7e8b729b2ef 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -163,10 +163,7 @@ class Pet(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 5b22fd2af25..3e461c701cb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -61,10 +61,7 @@ class Player(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 5b22fd2af25..3e461c701cb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -61,10 +61,7 @@ class Player(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 ac8a411c304..5730f45d974 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
@@ -74,10 +74,7 @@ class QuadrilateralInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index ac8a411c304..5730f45d974 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -74,10 +74,7 @@ class QuadrilateralInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index dafa4463317..099178f95d5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -55,10 +55,7 @@ class ReadOnlyFirst(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index dafa4463317..099178f95d5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -55,10 +55,7 @@ class ReadOnlyFirst(
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 087362c7359..654fec85fbf 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
@@ -71,10 +71,7 @@ class ScaleneTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 087362c7359..654fec85fbf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -71,10 +71,7 @@ class ScaleneTriangle(
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
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 db111f5b789..be10897bc19 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
@@ -71,10 +71,7 @@ class SimpleQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index db111f5b789..be10897bc19 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -71,10 +71,7 @@ class SimpleQuadrilateral(
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index a5daccbe96f..01abd68cc72 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -51,10 +51,7 @@ class SpecialModelName(
     
     def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index a5daccbe96f..01abd68cc72 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -51,10 +51,7 @@ class SpecialModelName(
     
     def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
index ccbd9fb2f56..449dc068050 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
@@ -37,10 +37,7 @@ class StringBooleanMap(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
index ccbd9fb2f56..449dc068050 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
@@ -37,10 +37,7 @@ class StringBooleanMap(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index 677e12aa413..4bc7d5ab9de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -55,10 +55,7 @@ class Tag(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index 677e12aa413..4bc7d5ab9de 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -55,10 +55,7 @@ class Tag(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 9d007664b66..961d18aa548 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
@@ -74,10 +74,7 @@ class TriangleInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index 9d007664b66..961d18aa548 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -74,10 +74,7 @@ class TriangleInterface(
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 de4c6782572..c3c74479086 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
@@ -165,10 +165,7 @@ class User(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index de4c6782572..c3c74479086 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -165,10 +165,7 @@ class User(
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 07e429e3644..4ff548e605e 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
@@ -78,10 +78,7 @@ class Whale(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index 07e429e3644..4ff548e605e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -78,10 +78,7 @@ class Whale(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 36e84efca58..787d981d2fe 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
@@ -99,10 +99,7 @@ class Zebra(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
index 36e84efca58..787d981d2fe 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
@@ -99,10 +99,7 @@ class Zebra(
     
     def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     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 4463663ce61..c5d7bbb5e6f 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
@@ -209,10 +209,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index 581de743da9..a42b6a0e450 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -171,10 +171,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 b72fa57998a..ee4b9c41a4f 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
@@ -382,10 +382,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 0c47a72011c..087daec266a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -306,10 +306,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
index e186156acf1..a492cd298af 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
@@ -38,10 +38,7 @@ class SchemaForRequestBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
index 9e1d529a985..ec9a4656217 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
@@ -36,10 +36,7 @@ class SchemaForRequestBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
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 ab62ffcb6aa..0f768dc7401 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
@@ -141,10 +141,7 @@ class CompositionInPropertySchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
@@ -308,10 +305,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
@@ -453,10 +447,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 8d3fe0ec0ac..2019a74679b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -133,10 +133,7 @@ class CompositionInPropertySchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
@@ -263,10 +260,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
@@ -392,10 +386,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index 5d1bbc1bbdc..7a54dea109c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -60,10 +60,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 51beee1ed34..11509c203bc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -58,10 +58,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index 71e43990fa8..dfb2ab0ce94 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -49,10 +49,7 @@ class MapBeanSchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index edeca906df6..3fee4be3958 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -47,10 +47,7 @@ class MapBeanSchema(
     
     def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 5e9d932e845..31757d35db1 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
@@ -87,10 +87,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index 8c417e784c1..ed2deb08ac8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -61,10 +61,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 6b3a29695da..9ad73baa38a 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
@@ -61,10 +61,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index 1ff8e580a71..fdf28f3be55 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -59,10 +59,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
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 b38e3b86547..358dabb5c3f 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
@@ -74,10 +74,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 0298e587c77..0948576aab9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -72,10 +72,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index d133227159b..f219e6a6f7e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -55,10 +55,7 @@ class SchemaFor0ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index 4aa4fce4d50..a8c90bdb8f2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -53,10 +53,7 @@ class SchemaFor0ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index 2231c7f9d26..c0e07db9491 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -82,10 +82,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index bbab7228532..3f2ebe45adf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -56,10 +56,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 0a51db2a4de..5b5b1672cf2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -84,10 +84,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 1e954cd8da1..b3a64f4495f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -58,10 +58,7 @@ class SchemaForRequestBodyMultipartFormData(
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
index ea7343d866d..93087b7d00c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
@@ -40,10 +40,7 @@ class SchemaFor200ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
index 9c8af294789..447adf9fdbe 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
@@ -35,10 +35,7 @@ class SchemaFor200ResponseBodyApplicationJson(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
 
     def __new__(
         cls,
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 8a873a29ece..6d2d71f4e2a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -1571,14 +1571,33 @@ class DictBase(Discriminable, ValidatorBase):
             raise AttributeError('property setting not supported on immutable instances')
 
     def __getattr__(self, name: str):
-        # for instance.name access
-        if isinstance(self, frozendict.frozendict):
-            # if an attribute does not exist
-            try:
-                return self[name]
-            except KeyError as ex:
-                raise AttributeError(str(ex))
-        return super().__getattr__(self, name)
+        """
+        for instance.name access
+
+        For type hints to accurately show that properties are optional
+        - values that do not exist in the dict but are present in properties must NOT throw AttributeError
+        - values that are not known about can throw AttributeErrors
+        """
+        if not isinstance(self, frozendict.frozendict):
+            return super().__getattr__(name)
+        # if an attribute does not exist
+        attribute_error = AttributeError(f"'{self}' has no attribute '{name}'")
+        try:
+            value = self[name]
+        except KeyError as _ex:
+            raise attribute_error
+        return value
+
+    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+        # dict_instance[name] accessor
+        if not isinstance(self, frozendict.frozendict):
+            return super().__getattr__(name)
+        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
+            return super().__getitem__(name)
+        try:
+            return super().__getitem__(name)
+        except KeyError:
+            return unset
 
 
 def cast_to_allowed_types(
@@ -2187,13 +2206,6 @@ class DictSchema(
     def __new__(cls, *args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
         return super().__new__(cls, *args, **kwargs)
 
-    def __getitem__(self, name: str):
-        # dict_instance[name] accessor
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return unset
-
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema}
 
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
index 213bb51239c..cd21e88f18e 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
@@ -37,7 +37,10 @@ class TestGmFruit(unittest.TestCase):
         color = 'yellow'
         cultivar = 'banaple'
         fruit = GmFruit(lengthCm=length_cm, color=color, cultivar=cultivar)
-        assert isinstance(fruit, (banana.Banana, apple.Apple, GmFruit, frozendict.frozendict))
+        assert isinstance(fruit, banana.Banana)
+        assert isinstance(fruit, apple.Apple)
+        assert isinstance(fruit, frozendict.frozendict)
+        assert isinstance(fruit, GmFruit)
         # check its properties
         self.assertEqual(fruit.lengthCm, length_cm)
         self.assertEqual(fruit['lengthCm'], length_cm)
@@ -45,6 +48,7 @@ class TestGmFruit(unittest.TestCase):
         self.assertEqual(fruit.color, color)
         self.assertEqual(fruit['color'], color)
         self.assertEqual(getattr(fruit, 'color'), color)
+
         # check the dict representation
         self.assertEqual(
             fruit,
@@ -56,13 +60,14 @@ class TestGmFruit(unittest.TestCase):
         )
 
         # known variable from Apple is unset if it is not in the payload
-        fruit_origin = fruit.origin
-        assert fruit_origin is schemas.unset
-        fruit_origin = fruit["origin"]
-        assert fruit_origin is schemas.unset
-
-        with self.assertRaises(KeyError):
-            fruit['unknown_variable']
+        fruit_origin_by_get_item = fruit["origin"]
+        assert fruit_origin_by_get_item is schemas.unset
+        with self.assertRaises(AttributeError):
+            fruit.origin
+        assert hasattr(fruit, 'origin') is False
+
+        unknown_variable = fruit['unknown_variable']
+        assert unknown_variable is schemas.unset
         # with getattr
         self.assertTrue(getattr(fruit, 'origin', 'some value'), 'some value')
 
-- 
GitLab


From bf2b3d9ef46ccdffaad4aa82d4c791031273cf13 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 13:32:36 -0700
Subject: [PATCH 16/30] Adds get_item_oapg, removes unset from get_item and
 getattr

---
 ...property_getitems_with_addprops.handlebars |  64 ++++++++-
 ..._getitems_with_addprops_getitem.handlebars |   6 +-
 ...perty_getitems_without_addprops.handlebars |  31 ++++-
 .../property_type_hints.handlebars            |  13 --
 .../python-experimental/schemas.handlebars    |  30 +++--
 .../model/additional_properties_class.py      |  73 ++++++++---
 .../model/additional_properties_class.pyi     |  73 ++++++++---
 ...ditional_properties_with_array_of_enums.py |   3 +
 ...itional_properties_with_array_of_enums.pyi |   3 +
 .../petstore_api/model/address.py             |   3 +
 .../petstore_api/model/address.pyi            |   3 +
 .../petstore_api/model/animal.py              |  19 ++-
 .../petstore_api/model/animal.pyi             |  19 ++-
 .../petstore_api/model/api_response.py        |  28 +++-
 .../petstore_api/model/api_response.pyi       |  28 +++-
 .../petstore_api/model/apple.py               |  19 ++-
 .../petstore_api/model/apple.pyi              |  19 ++-
 .../petstore_api/model/apple_req.py           |  12 +-
 .../petstore_api/model/apple_req.pyi          |  12 +-
 .../model/array_of_array_of_number_only.py    |  16 ++-
 .../model/array_of_array_of_number_only.pyi   |  16 ++-
 .../model/array_of_number_only.py             |  16 ++-
 .../model/array_of_number_only.pyi            |  16 ++-
 .../petstore_api/model/array_test.py          |  28 +++-
 .../petstore_api/model/array_test.pyi         |  28 +++-
 .../petstore_api/model/banana.py              |  13 +-
 .../petstore_api/model/banana.pyi             |  13 +-
 .../petstore_api/model/banana_req.py          |  12 +-
 .../petstore_api/model/banana_req.pyi         |  12 +-
 .../petstore_api/model/basque_pig.py          |  13 +-
 .../petstore_api/model/basque_pig.pyi         |  13 +-
 .../petstore_api/model/capitalization.py      |  46 +++++--
 .../petstore_api/model/capitalization.pyi     |  46 +++++--
 .../petstore_api/model/cat.py                 |  16 ++-
 .../petstore_api/model/cat.pyi                |  16 ++-
 .../petstore_api/model/category.py            |  19 ++-
 .../petstore_api/model/category.pyi           |  19 ++-
 .../petstore_api/model/child_cat.py           |  16 ++-
 .../petstore_api/model/child_cat.pyi          |  16 ++-
 .../petstore_api/model/class_model.py         |  16 ++-
 .../petstore_api/model/class_model.pyi        |  16 ++-
 .../petstore_api/model/client.py              |  16 ++-
 .../petstore_api/model/client.pyi             |  16 ++-
 .../model/complex_quadrilateral.py            |  16 ++-
 .../model/complex_quadrilateral.pyi           |  16 ++-
 .../petstore_api/model/danish_pig.py          |  13 +-
 .../petstore_api/model/danish_pig.pyi         |  13 +-
 .../petstore_api/model/dog.py                 |  16 ++-
 .../petstore_api/model/dog.pyi                |  16 ++-
 .../petstore_api/model/drawing.py             |  30 +++--
 .../petstore_api/model/drawing.pyi            |  30 +++--
 .../petstore_api/model/enum_arrays.py         |  22 +++-
 .../petstore_api/model/enum_arrays.pyi        |  22 +++-
 .../petstore_api/model/enum_test.py           |  61 ++++++---
 .../petstore_api/model/enum_test.pyi          |  61 ++++++---
 .../model/equilateral_triangle.py             |  16 ++-
 .../model/equilateral_triangle.pyi            |  16 ++-
 .../petstore_api/model/file.py                |  16 ++-
 .../petstore_api/model/file.pyi               |  16 ++-
 .../model/file_schema_test_class.py           |  22 +++-
 .../model/file_schema_test_class.pyi          |  22 +++-
 .../petstore_api/model/foo.py                 |  16 ++-
 .../petstore_api/model/foo.pyi                |  16 ++-
 .../petstore_api/model/format_test.py         | 123 +++++++++++++-----
 .../petstore_api/model/format_test.pyi        | 123 +++++++++++++-----
 .../petstore_api/model/fruit.py               |  16 ++-
 .../petstore_api/model/fruit.pyi              |  16 ++-
 .../petstore_api/model/gm_fruit.py            |  16 ++-
 .../petstore_api/model/gm_fruit.pyi           |  16 ++-
 .../petstore_api/model/grandparent_animal.py  |  13 +-
 .../petstore_api/model/grandparent_animal.pyi |  13 +-
 .../petstore_api/model/has_only_read_only.py  |  22 +++-
 .../petstore_api/model/has_only_read_only.pyi |  22 +++-
 .../petstore_api/model/health_check_result.py |  16 ++-
 .../model/health_check_result.pyi             |  16 ++-
 .../petstore_api/model/isosceles_triangle.py  |  16 ++-
 .../petstore_api/model/isosceles_triangle.pyi |  16 ++-
 .../petstore_api/model/map_test.py            |  46 +++++--
 .../petstore_api/model/map_test.pyi           |  46 +++++--
 ...perties_and_additional_properties_class.py |  31 ++++-
 ...erties_and_additional_properties_class.pyi |  31 ++++-
 .../petstore_api/model/model200_response.py   |  21 ++-
 .../petstore_api/model/model200_response.pyi  |  21 ++-
 .../petstore_api/model/model_return.py        |  15 ++-
 .../petstore_api/model/model_return.pyi       |  15 ++-
 .../petstore_api/model/money.py               |  16 ++-
 .../petstore_api/model/money.pyi              |  16 ++-
 .../petstore_api/model/name.py                |  24 +++-
 .../petstore_api/model/name.pyi               |  24 +++-
 .../model/no_additional_properties.py         |  12 +-
 .../model/no_additional_properties.pyi        |  12 +-
 .../petstore_api/model/nullable_class.py      |  87 +++++++++----
 .../petstore_api/model/nullable_class.pyi     |  87 +++++++++----
 .../petstore_api/model/number_only.py         |  16 ++-
 .../petstore_api/model/number_only.pyi        |  16 ++-
 .../model/object_model_with_ref_props.py      |  28 +++-
 .../model/object_model_with_ref_props.pyi     |  28 +++-
 .../model/object_with_decimal_properties.py   |  28 +++-
 .../model/object_with_decimal_properties.pyi  |  28 +++-
 .../object_with_difficultly_named_props.py    |  23 +++-
 .../object_with_difficultly_named_props.pyi   |  23 +++-
 ...object_with_inline_composition_property.py |  16 ++-
 ...bject_with_inline_composition_property.pyi |  16 ++-
 .../petstore_api/model/order.py               |  46 +++++--
 .../petstore_api/model/order.pyi              |  46 +++++--
 .../petstore_api/model/pet.py                 |  40 ++++--
 .../petstore_api/model/pet.pyi                |  40 ++++--
 .../petstore_api/model/player.py              |  22 +++-
 .../petstore_api/model/player.pyi             |  22 +++-
 .../model/quadrilateral_interface.py          |  16 ++-
 .../model/quadrilateral_interface.pyi         |  16 ++-
 .../petstore_api/model/read_only_first.py     |  22 +++-
 .../petstore_api/model/read_only_first.pyi    |  22 +++-
 .../petstore_api/model/scalene_triangle.py    |  16 ++-
 .../petstore_api/model/scalene_triangle.pyi   |  16 ++-
 .../model/simple_quadrilateral.py             |  16 ++-
 .../model/simple_quadrilateral.pyi            |  16 ++-
 .../petstore_api/model/special_model_name.py  |  16 ++-
 .../petstore_api/model/special_model_name.pyi |  16 ++-
 .../petstore_api/model/string_boolean_map.py  |   3 +
 .../petstore_api/model/string_boolean_map.pyi |   3 +
 .../petstore_api/model/tag.py                 |  22 +++-
 .../petstore_api/model/tag.pyi                |  22 +++-
 .../petstore_api/model/triangle_interface.py  |  16 ++-
 .../petstore_api/model/triangle_interface.pyi |  16 ++-
 .../petstore_api/model/user.py                |  88 +++++++++----
 .../petstore_api/model/user.pyi               |  88 +++++++++----
 .../petstore_api/model/whale.py               |  25 +++-
 .../petstore_api/model/whale.pyi              |  25 +++-
 .../petstore_api/model/zebra.py               |  15 ++-
 .../petstore_api/model/zebra.pyi              |  15 ++-
 .../petstore_api/paths/fake_1/post.py         |  81 +++++++++---
 .../petstore_api/paths/fake_1/post.pyi        |  81 +++++++++---
 .../petstore_api/paths/fake_2/get.py          |  22 +++-
 .../petstore_api/paths/fake_2/get.pyi         |  22 +++-
 .../fake_inline_additional_properties/post.py |   3 +
 .../post.pyi                                  |   3 +
 .../paths/fake_inline_composition_/post.py    |  48 +++++--
 .../paths/fake_inline_composition_/post.pyi   |  48 +++++--
 .../paths/fake_json_form_data/get.py          |  16 ++-
 .../paths/fake_json_form_data/get.pyi         |  16 ++-
 .../paths/fake_obj_in_query/get.py            |  16 ++-
 .../paths/fake_obj_in_query/get.pyi           |  16 ++-
 .../post.py                                   |  19 ++-
 .../post.pyi                                  |  19 ++-
 .../paths/fake_upload_file/post.py            |  19 ++-
 .../paths/fake_upload_file/post.pyi           |  19 ++-
 .../paths/fake_upload_files/post.py           |  16 ++-
 .../paths/fake_upload_files/post.pyi          |  16 ++-
 .../petstore_api/paths/foo/get.py             |  16 ++-
 .../petstore_api/paths/foo/get.pyi            |  16 ++-
 .../petstore_api/paths/pet_pet_id_3/post.py   |  22 +++-
 .../petstore_api/paths/pet_pet_id_3/post.pyi  |  22 +++-
 .../paths/pet_pet_id_upload_image/post.py     |  22 +++-
 .../paths/pet_pet_id_upload_image/post.pyi    |  22 +++-
 .../petstore_api/paths/store_inventory/get.py |   3 +
 .../paths/store_inventory/get.pyi             |   3 +
 .../petstore_api/schemas.py                   |  30 +++--
 .../tests_manual/test_fruit.py                |  35 +----
 .../tests_manual/test_fruit_req.py            |  15 +--
 .../tests_manual/test_gm_fruit.py             |   4 +-
 161 files changed, 3064 insertions(+), 890 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
index 388b9b10f5c..3ab498cd027 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops.handlebars
@@ -25,12 +25,12 @@ def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.proper
 
 @typing.overload
 {{#if complexType}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union['{{complexType}}', schemas.Unset]: ...
+def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
 {{else}}
 {{#if nameInSnakeCase}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{name}}, schemas.Unset]: ...
+def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
 {{else}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{baseName}}, schemas.Unset]: ...
+def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
 {{/if}}
 {{/if}}
 {{/unless}}
@@ -45,10 +45,64 @@ def __getitem__(self, name: str) -> typing.Union[{{#if complexType}}'{{complexTy
 {{/unless}}
 {{/with}}
 
-{{> model_templates/property_getitems_with_addprops_getitem }}
+{{> model_templates/property_getitems_with_addprops_getitem methodName="__getitem__" }}
+{{else}}
+{{#not additionalProperties.getIsBooleanSchemaFalse}}
+
+{{> model_templates/property_getitems_with_addprops_getitem methodName="__getitem__" }}
+{{/not}}
+{{/or}}
+{{#if getRequiredVarsMap}}
+{{#each getRequiredVarsMap}}
+{{#with this}}
+
+@typing.overload
+{{#if complexType}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+{{else}}
+{{#if schemaIsFromAdditionalProperties}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
+{{else}}
+{{#if nameInSnakeCase}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
+{{else}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
+{{/if}}
+{{/if}}
+{{/if}}
+{{/with}}
+{{/each}}
+{{/if}}
+{{#if vars}}
+{{#each vars}}
+{{#unless required}}
+
+@typing.overload
+{{#if complexType}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union['{{complexType}}', schemas.Unset]: ...
+{{else}}
+{{#if nameInSnakeCase}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{name}}, schemas.Unset]: ...
+{{else}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{baseName}}, schemas.Unset]: ...
+{{/if}}
+{{/if}}
+{{/unless}}
+{{/each}}
+{{/if}}
+{{#or vars getRequiredVarsMap}}
+{{#with additionalProperties}}
+{{#unless getIsBooleanSchemaFalse}}
+
+@typing.overload
+def get_item_oapg(self, name: str) -> typing.Union[{{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}, schemas.Unset]: ...
+{{/unless}}
+{{/with}}
+
+{{> model_templates/property_getitems_with_addprops_getitem methodName="get_item_oapg" }}
 {{else}}
 {{#not additionalProperties.getIsBooleanSchemaFalse}}
 
-{{> model_templates/property_getitems_with_addprops_getitem }}
+{{> model_templates/property_getitems_with_addprops_getitem methodName="get_item_oapg" }}
 {{/not}}
 {{/or}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
index 54977796ed7..9e84366ac16 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_with_addprops_getitem.handlebars
@@ -1,3 +1,5 @@
-def __getitem__(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
+def {{methodName}}(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
+{{#eq methodName "__getitem__"}}
     # dict_instance[name] accessor
-    return super().__getitem__(name)
+{{/eq}}
+    return super().{{methodName}}(name)
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
index 233d634d158..69a2b1c4c7d 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
@@ -3,21 +3,44 @@
 
 @typing.overload
 {{#if complexType}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}'{{complexType}}'{{#unless required}}, schemas.Unset]{{/unless}}: ...
+def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
 {{else}}
 {{#if nameInSnakeCase}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{name}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
+def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
 {{else}}
-def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{baseName}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
+def __getitem__(self, name: typing.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{baseName}}: ...
 {{/if}}
 {{/if}}
 {{/each}}
 
 @typing.overload
-def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
 
 def __getitem__(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
     # dict_instance[name] accessor
     return super().__getitem__(name)
 
+{{/if}}
+{{#if vars}}
+{{#each vars}}
+
+@typing.overload
+{{#if complexType}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}'{{complexType}}'{{#unless required}}, schemas.Unset]{{/unless}}: ...
+{{else}}
+{{#if nameInSnakeCase}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{name}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
+{{else}}
+def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{baseName}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
+{{/if}}
+{{/if}}
+{{/each}}
+
+@typing.overload
+def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+
+def get_item_oapg(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
+    # dict_instance[name] accessor
+    return super().__getitem__(name)
+
 {{/if}}
\ No newline at end of file
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 888f7a8e16c..80422bffc63 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
@@ -18,19 +18,6 @@
 {{/with}}
 {{/each}}
 {{/if}}
-{{#if vars}}
-{{#each vars}}
-{{#unless required}}
-{{#unless nameInSnakeCase}}
-{{#if complexType}}
-{{baseName}}: typing.Union['{{complexType}}', schemas.Unset]
-{{else}}
-{{baseName}}: typing.Union[MetaOapg.properties.{{baseName}}, schemas.Unset]
-{{/if}}
-{{/unless}}
-{{/unless}}
-{{/each}}
-{{/if}}
 {{#if additionalProperties}}
 {{> model_templates/property_getitems_with_addprops }}
 {{else}}
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 ec48462219d..7124d5fc78e 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -1563,30 +1563,32 @@ class DictBase(Discriminable, ValidatorBase):
         if not isinstance(self, FileIO):
             raise AttributeError('property setting not supported on immutable instances')
 
-    def __getattr__(self, name: str):
+    def __getattr__(self, name: str) typing.Union['AnyTypeSchema']:
         """
         for instance.name access
-
-        For type hints to accurately show that properties are optional
-        - values that do not exist in the dict but are present in properties must NOT throw AttributeError
-        - values that are not known about can throw AttributeErrors
+        Properties are only type hinted for required properties
+        so that hasattr(instance, 'optionalProp') is False when that key is not present
         """
         if not isinstance(self, frozendict.frozendict):
             return super().__getattr__(name)
-        # if an attribute does not exist
-        attribute_error = AttributeError(f"'{self}' has no attribute '{name}'")
         try:
             value = self[name]
-        except KeyError as _ex:
-            raise attribute_error
-        return value
+        except KeyError as ex:
+            raise AttributeError(str(ex))
 
-    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
-        # dict_instance[name] accessor
+    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema']:
+        """
+        dict_instance[name] accessor
+        key errors thrown
+        """
         if not isinstance(self, frozendict.frozendict):
             return super().__getattr__(name)
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
+        return super().__getitem__(name)
+
+    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+        # dict_instance[name] accessor
+        if not isinstance(self, frozendict.frozendict):
+            raise NotImplementedError()
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index a8b07db6058..28b61d96070 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -47,6 +47,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -81,6 +84,9 @@ class AdditionalPropertiesClass(
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
+                        
+                        def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                            return super().get_item_oapg(name)
                     
                         def __new__(
                             cls,
@@ -98,6 +104,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -127,6 +136,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -173,6 +185,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -197,46 +212,70 @@ class AdditionalPropertiesClass(
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
     
-    map_property: typing.Union[MetaOapg.properties.map_property, schemas.Unset]
-    map_of_map_property: typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]
-    anytype_1: typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]
-    map_with_undeclared_properties_anytype_1: typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]
-    map_with_undeclared_properties_anytype_2: typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]
-    map_with_undeclared_properties_anytype_3: typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]
-    empty_map: typing.Union[MetaOapg.properties.empty_map, schemas.Unset]
-    map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_of_map_property"]) -> MetaOapg.properties.map_of_map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anytype_1"]) -> MetaOapg.properties.anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_2: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_3: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["empty_map"]) -> MetaOapg.properties.empty_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.properties.map_with_undeclared_properties_string: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index a8b07db6058..28b61d96070 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -47,6 +47,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -81,6 +84,9 @@ class AdditionalPropertiesClass(
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
+                        
+                        def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                            return super().get_item_oapg(name)
                     
                         def __new__(
                             cls,
@@ -98,6 +104,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -127,6 +136,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -173,6 +185,9 @@ class AdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -197,46 +212,70 @@ class AdditionalPropertiesClass(
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
     
-    map_property: typing.Union[MetaOapg.properties.map_property, schemas.Unset]
-    map_of_map_property: typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]
-    anytype_1: typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]
-    map_with_undeclared_properties_anytype_1: typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]
-    map_with_undeclared_properties_anytype_2: typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]
-    map_with_undeclared_properties_anytype_3: typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]
-    empty_map: typing.Union[MetaOapg.properties.empty_map, schemas.Unset]
-    map_with_undeclared_properties_string: typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_of_map_property"]) -> MetaOapg.properties.map_of_map_property: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anytype_1"]) -> MetaOapg.properties.anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_2: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.properties.map_with_undeclared_properties_anytype_3: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["empty_map"]) -> MetaOapg.properties.empty_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.properties.map_with_undeclared_properties_string: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_property"]) -> typing.Union[MetaOapg.properties.map_property, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.properties.map_of_map_property, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anytype_1"]) -> typing.Union[MetaOapg.properties.anytype_1, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_1, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_2, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_anytype_3, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["empty_map"]) -> typing.Union[MetaOapg.properties.empty_map, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.properties.map_with_undeclared_properties_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 8e2e2a9f5da..5eeb899dd37 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
@@ -64,6 +64,9 @@ class AdditionalPropertiesWithArrayOfEnums(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
index 8e2e2a9f5da..5eeb899dd37 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_with_array_of_enums.pyi
@@ -64,6 +64,9 @@ class AdditionalPropertiesWithArrayOfEnums(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
index a6b021e6b84..fca46a2b791 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.py
@@ -38,6 +38,9 @@ class Address(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
index a6b021e6b84..fca46a2b791 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/address.pyi
@@ -38,6 +38,9 @@ class Address(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index 46cf9136575..f27ca479b90 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -55,21 +55,34 @@ class Animal(
             }
     
     className: MetaOapg.properties.className
-    color: typing.Union[MetaOapg.properties.color, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "color", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index 46cf9136575..f27ca479b90 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -55,21 +55,34 @@ class Animal(
             }
     
     className: MetaOapg.properties.className
-    color: typing.Union[MetaOapg.properties.color, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "color", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index b33f10fcf79..0cc3b30d1d9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -43,26 +43,40 @@ class ApiResponse(
                 "message": message,
             }
     
-    code: typing.Union[MetaOapg.properties.code, schemas.Unset]
-    type: typing.Union[MetaOapg.properties.type, schemas.Unset]
-    message: typing.Union[MetaOapg.properties.message, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["code"]) -> MetaOapg.properties.code: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["message"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index b33f10fcf79..0cc3b30d1d9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -43,26 +43,40 @@ class ApiResponse(
                 "message": message,
             }
     
-    code: typing.Union[MetaOapg.properties.code, schemas.Unset]
-    type: typing.Union[MetaOapg.properties.type, schemas.Unset]
-    message: typing.Union[MetaOapg.properties.message, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["code"]) -> MetaOapg.properties.code: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["message"]) -> MetaOapg.properties.message: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["code"]) -> typing.Union[MetaOapg.properties.code, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["message"]) -> typing.Union[MetaOapg.properties.message, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 d4b7e743195..99cc2870892 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
@@ -73,21 +73,34 @@ class Apple(
 
     
     cultivar: MetaOapg.properties.cultivar
-    origin: typing.Union[MetaOapg.properties.origin, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["origin"]) -> MetaOapg.properties.origin: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index 5600f43ee6f..f01281dce77 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -60,21 +60,34 @@ class Apple(
 
     
     cultivar: MetaOapg.properties.cultivar
-    origin: typing.Union[MetaOapg.properties.origin, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["origin"]) -> MetaOapg.properties.origin: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["origin"]) -> typing.Union[MetaOapg.properties.origin, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
index c12df46aad6..7e6b8bc8a12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py
@@ -46,17 +46,25 @@ class AppleReq(
         additional_properties = schemas.NotAnyTypeSchema
     
     cultivar: MetaOapg.properties.cultivar
-    mealy: typing.Union[MetaOapg.properties.mealy, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["mealy"]) -> MetaOapg.properties.mealy: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
index c12df46aad6..7e6b8bc8a12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.pyi
@@ -46,17 +46,25 @@ class AppleReq(
         additional_properties = schemas.NotAnyTypeSchema
     
     cultivar: MetaOapg.properties.cultivar
-    mealy: typing.Union[MetaOapg.properties.mealy, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["mealy"]) -> MetaOapg.properties.mealy: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["cultivar"]) -> MetaOapg.properties.cultivar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["mealy"]) -> typing.Union[MetaOapg.properties.mealy, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar"], typing.Literal["mealy"], ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 af4102c23ee..e7a49bd8d9d 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
@@ -83,18 +83,28 @@ class ArrayOfArrayOfNumberOnly(
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
     
-    ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index af4102c23ee..e7a49bd8d9d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -83,18 +83,28 @@ class ArrayOfArrayOfNumberOnly(
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
     
-    ArrayArrayNumber: typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayArrayNumber, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 4c15cd2ffc9..ce257d4fb7a 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
@@ -61,18 +61,28 @@ class ArrayOfNumberOnly(
                 "ArrayNumber": ArrayNumber,
             }
     
-    ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 4c15cd2ffc9..ce257d4fb7a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -61,18 +61,28 @@ class ArrayOfNumberOnly(
                 "ArrayNumber": ArrayNumber,
             }
     
-    ArrayNumber: typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.properties.ArrayNumber, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 71d18a90881..d4c53bcabfc 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
@@ -157,26 +157,40 @@ class ArrayTest(
                 "array_array_of_model": array_array_of_model,
             }
     
-    array_of_string: typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]
-    array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]
-    array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_array_of_integer"]) -> MetaOapg.properties.array_array_of_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> MetaOapg.properties.array_array_of_model: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index 71d18a90881..d4c53bcabfc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -157,26 +157,40 @@ class ArrayTest(
                 "array_array_of_model": array_array_of_model,
             }
     
-    array_of_string: typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]
-    array_array_of_integer: typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]
-    array_array_of_model: typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_array_of_integer"]) -> MetaOapg.properties.array_array_of_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_array_of_model"]) -> MetaOapg.properties.array_array_of_model: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_of_string"]) -> typing.Union[MetaOapg.properties.array_of_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.properties.array_array_of_integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.properties.array_array_of_model, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index 0afb6ebc675..b049e0d5e70 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -48,12 +48,23 @@ class Banana(
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index 0afb6ebc675..b049e0d5e70 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -48,12 +48,23 @@ class Banana(
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
index 150efd2b437..14b8a0d8e08 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py
@@ -46,17 +46,25 @@ class BananaReq(
         additional_properties = schemas.NotAnyTypeSchema
     
     lengthCm: MetaOapg.properties.lengthCm
-    sweet: typing.Union[MetaOapg.properties.sweet, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["sweet"]) -> MetaOapg.properties.sweet: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
index 150efd2b437..14b8a0d8e08 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.pyi
@@ -46,17 +46,25 @@ class BananaReq(
         additional_properties = schemas.NotAnyTypeSchema
     
     lengthCm: MetaOapg.properties.lengthCm
-    sweet: typing.Union[MetaOapg.properties.sweet, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["sweet"]) -> MetaOapg.properties.sweet: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["lengthCm"]) -> MetaOapg.properties.lengthCm: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["sweet"]) -> typing.Union[MetaOapg.properties.sweet, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm"], typing.Literal["sweet"], ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index 32a26daa786..849509d2a52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -62,12 +62,23 @@ class BasquePig(
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index 32a26daa786..849509d2a52 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -62,12 +62,23 @@ class BasquePig(
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index 581ff20af83..96b6e28ed19 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -49,38 +49,58 @@ class Capitalization(
                 "ATT_NAME": ATT_NAME,
             }
     
-    smallCamel: typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]
-    CapitalCamel: typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]
-    small_Snake: typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]
-    Capital_Snake: typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]
-    SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]
-    ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["CapitalCamel"]) -> MetaOapg.properties.CapitalCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["small_Snake"]) -> MetaOapg.properties.small_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["Capital_Snake"]) -> MetaOapg.properties.Capital_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.properties.SCA_ETH_Flow_Points: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> MetaOapg.properties.ATT_NAME: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index 581ff20af83..96b6e28ed19 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -49,38 +49,58 @@ class Capitalization(
                 "ATT_NAME": ATT_NAME,
             }
     
-    smallCamel: typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]
-    CapitalCamel: typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]
-    small_Snake: typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]
-    Capital_Snake: typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]
-    SCA_ETH_Flow_Points: typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]
-    ATT_NAME: typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["CapitalCamel"]) -> MetaOapg.properties.CapitalCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["small_Snake"]) -> MetaOapg.properties.small_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["Capital_Snake"]) -> MetaOapg.properties.Capital_Snake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.properties.SCA_ETH_Flow_Points: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["ATT_NAME"]) -> MetaOapg.properties.ATT_NAME: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["smallCamel"]) -> typing.Union[MetaOapg.properties.smallCamel, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.properties.CapitalCamel, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["small_Snake"]) -> typing.Union[MetaOapg.properties.small_Snake, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.properties.Capital_Snake, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.properties.SCA_ETH_Flow_Points, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.properties.ATT_NAME, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 3761510eb00..fa3da4c3b3d 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
@@ -47,18 +47,28 @@ class Cat(
                         "declawed": declawed,
                     }
             
-            declawed: typing.Union[MetaOapg.properties.declawed, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["declawed", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index 3761510eb00..fa3da4c3b3d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -47,18 +47,28 @@ class Cat(
                         "declawed": declawed,
                     }
             
-            declawed: typing.Union[MetaOapg.properties.declawed, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["declawed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["declawed"]) -> typing.Union[MetaOapg.properties.declawed, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["declawed", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
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 4f29fe0a9bd..d4472046c9f 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
@@ -45,21 +45,34 @@ class Category(
             }
     
     name: MetaOapg.properties.name
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "id", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index 4f29fe0a9bd..d4472046c9f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -45,21 +45,34 @@ class Category(
             }
     
     name: MetaOapg.properties.name
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "id", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "id", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     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 ef9d8ce779a..44d5bb9ee07 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
@@ -47,18 +47,28 @@ class ChildCat(
                         "name": name,
                     }
             
-            name: typing.Union[MetaOapg.properties.name, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["name", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index ef9d8ce779a..44d5bb9ee07 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -47,18 +47,28 @@ class ChildCat(
                         "name": name,
                     }
             
-            name: typing.Union[MetaOapg.properties.name, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["name", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["name", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
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 90e53b43f6e..f2029293ba5 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
@@ -42,18 +42,28 @@ class ClassModel(
             }
 
     
-    _class: typing.Union[MetaOapg.properties._class, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["_class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["_class", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index 90e53b43f6e..f2029293ba5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -42,18 +42,28 @@ class ClassModel(
             }
 
     
-    _class: typing.Union[MetaOapg.properties._class, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["_class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["_class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["_class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["_class", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 7e88c1d2e86..9999861d505 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -39,18 +39,28 @@ class Client(
                 "client": client,
             }
     
-    client: typing.Union[MetaOapg.properties.client, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["client"]) -> MetaOapg.properties.client: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["client", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 7e88c1d2e86..9999861d505 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -39,18 +39,28 @@ class Client(
                 "client": client,
             }
     
-    client: typing.Union[MetaOapg.properties.client, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["client"]) -> MetaOapg.properties.client: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["client", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["client"]) -> typing.Union[MetaOapg.properties.client, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["client", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 3d9e12c71ec..21f5738bedf 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
@@ -61,18 +61,28 @@ class ComplexQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 3d9e12c71ec..21f5738bedf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -61,18 +61,28 @@ class ComplexQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index 04dc60b6204..9e43ce663cb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -62,12 +62,23 @@ class DanishPig(
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index 04dc60b6204..9e43ce663cb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -62,12 +62,23 @@ class DanishPig(
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 9793dd7d2bb..4e06aff1388 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
@@ -47,18 +47,28 @@ class Dog(
                         "breed": breed,
                     }
             
-            breed: typing.Union[MetaOapg.properties.breed, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["breed"]) -> MetaOapg.properties.breed: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["breed", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 9793dd7d2bb..4e06aff1388 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -47,18 +47,28 @@ class Dog(
                         "breed": breed,
                     }
             
-            breed: typing.Union[MetaOapg.properties.breed, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["breed"]) -> MetaOapg.properties.breed: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["breed", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["breed"]) -> typing.Union[MetaOapg.properties.breed, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["breed", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
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 e9beac8ddd7..37723450eb1 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
@@ -88,22 +88,18 @@ class Drawing(
         def additional_properties(cls) -> typing.Type['Fruit']:
             return Fruit
     
-    mainShape: typing.Union['Shape', schemas.Unset]
-    shapeOrNull: typing.Union['ShapeOrNull', schemas.Unset]
-    nullableShape: typing.Union['NullableShape', schemas.Unset]
-    shapes: typing.Union[MetaOapg.properties.shapes, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["mainShape"]) -> 'Shape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["shapeOrNull"]) -> 'ShapeOrNull': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["nullableShape"]) -> 'NullableShape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["shapes"]) -> MetaOapg.properties.shapes: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
@@ -111,6 +107,24 @@ class Drawing(
     def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
index e9beac8ddd7..37723450eb1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
@@ -88,22 +88,18 @@ class Drawing(
         def additional_properties(cls) -> typing.Type['Fruit']:
             return Fruit
     
-    mainShape: typing.Union['Shape', schemas.Unset]
-    shapeOrNull: typing.Union['ShapeOrNull', schemas.Unset]
-    nullableShape: typing.Union['NullableShape', schemas.Unset]
-    shapes: typing.Union[MetaOapg.properties.shapes, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["mainShape"]) -> 'Shape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["shapeOrNull"]) -> 'ShapeOrNull': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["nullableShape"]) -> 'NullableShape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["shapes"]) -> MetaOapg.properties.shapes: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
@@ -111,6 +107,24 @@ class Drawing(
     def __getitem__(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["mainShape"]) -> typing.Union['Shape', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapeOrNull"]) -> typing.Union['ShapeOrNull', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["nullableShape"]) -> typing.Union['NullableShape', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapes"]) -> typing.Union[MetaOapg.properties.shapes, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union['Fruit', schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["mainShape"], typing.Literal["shapeOrNull"], typing.Literal["nullableShape"], typing.Literal["shapes"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 ec6553aa2e4..550c48d66ce 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
@@ -103,22 +103,34 @@ class EnumArrays(
                 "array_enum": array_enum,
             }
     
-    just_symbol: typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]
-    array_enum: typing.Union[MetaOapg.properties.array_enum, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_enum"]) -> MetaOapg.properties.array_enum: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index ec6553aa2e4..550c48d66ce 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -103,22 +103,34 @@ class EnumArrays(
                 "array_enum": array_enum,
             }
     
-    just_symbol: typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]
-    array_enum: typing.Union[MetaOapg.properties.array_enum, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_enum"]) -> MetaOapg.properties.array_enum: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["just_symbol"]) -> typing.Union[MetaOapg.properties.just_symbol, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_enum"]) -> typing.Union[MetaOapg.properties.array_enum, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 43dc9ed0d40..dd88bcc586b 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
@@ -171,49 +171,76 @@ class EnumTest(
             }
     
     enum_string_required: MetaOapg.properties.enum_string_required
-    enum_string: typing.Union[MetaOapg.properties.enum_string, schemas.Unset]
-    enum_integer: typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]
-    enum_number: typing.Union[MetaOapg.properties.enum_number, schemas.Unset]
-    stringEnum: typing.Union['StringEnum', schemas.Unset]
-    IntegerEnum: typing.Union['IntegerEnum', schemas.Unset]
-    StringEnumWithDefaultValue: typing.Union['StringEnumWithDefaultValue', schemas.Unset]
-    IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]
-    IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_string"]) -> MetaOapg.properties.enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_integer"]) -> MetaOapg.properties.enum_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_number"]) -> MetaOapg.properties.enum_number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["stringEnum"]) -> 'StringEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["IntegerEnum"]) -> 'IntegerEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> 'StringEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> 'IntegerEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> 'IntegerEnumOneValue': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index 43dc9ed0d40..dd88bcc586b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -171,49 +171,76 @@ class EnumTest(
             }
     
     enum_string_required: MetaOapg.properties.enum_string_required
-    enum_string: typing.Union[MetaOapg.properties.enum_string, schemas.Unset]
-    enum_integer: typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]
-    enum_number: typing.Union[MetaOapg.properties.enum_number, schemas.Unset]
-    stringEnum: typing.Union['StringEnum', schemas.Unset]
-    IntegerEnum: typing.Union['IntegerEnum', schemas.Unset]
-    StringEnumWithDefaultValue: typing.Union['StringEnumWithDefaultValue', schemas.Unset]
-    IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]
-    IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_string"]) -> MetaOapg.properties.enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_integer"]) -> MetaOapg.properties.enum_integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_number"]) -> MetaOapg.properties.enum_number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["stringEnum"]) -> 'StringEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["IntegerEnum"]) -> 'IntegerEnum': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> 'StringEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> 'IntegerEnumWithDefaultValue': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["IntegerEnumOneValue"]) -> 'IntegerEnumOneValue': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_string_required"]) -> MetaOapg.properties.enum_string_required: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_string"]) -> typing.Union[MetaOapg.properties.enum_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_integer"]) -> typing.Union[MetaOapg.properties.enum_integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_number"]) -> typing.Union[MetaOapg.properties.enum_number, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["stringEnum"]) -> typing.Union['StringEnum', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["IntegerEnum"]) -> typing.Union['IntegerEnum', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["StringEnumWithDefaultValue"]) -> typing.Union['StringEnumWithDefaultValue', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["IntegerEnumOneValue"]) -> typing.Union['IntegerEnumOneValue', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 7149ead37e7..35f2a4d59d2 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
@@ -61,18 +61,28 @@ class EquilateralTriangle(
                         "triangleType": triangleType,
                     }
             
-            triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index 7149ead37e7..35f2a4d59d2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -61,18 +61,28 @@ class EquilateralTriangle(
                         "triangleType": triangleType,
                     }
             
-            triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 36470b213a7..b3a97f97884 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -41,18 +41,28 @@ class File(
                 "sourceURI": sourceURI,
             }
     
-    sourceURI: typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 36470b213a7..b3a97f97884 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -41,18 +41,28 @@ class File(
                 "sourceURI": sourceURI,
             }
     
-    sourceURI: typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["sourceURI"]) -> typing.Union[MetaOapg.properties.sourceURI, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 65e0581b6f1..15289da69ea 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
@@ -71,22 +71,34 @@ class FileSchemaTestClass(
                 "files": files,
             }
     
-    file: typing.Union['File', schemas.Unset]
-    files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["file"]) -> 'File': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["file", "files", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 65e0581b6f1..15289da69ea 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -71,22 +71,34 @@ class FileSchemaTestClass(
                 "files": files,
             }
     
-    file: typing.Union['File', schemas.Unset]
-    files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["file"]) -> 'File': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["file", "files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union['File', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["file", "files", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index ee4b52f8ab0..0146852bbb5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -39,18 +39,28 @@ class Foo(
                 "bar": bar,
             }
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index ee4b52f8ab0..0146852bbb5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -39,18 +39,28 @@ class Foo(
                 "bar": bar,
             }
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 6ff20232030..e193ad50ef5 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
@@ -204,22 +204,6 @@ class FormatTest(
     number: MetaOapg.properties.number
     password: MetaOapg.properties.password
     byte: MetaOapg.properties.byte
-    integer: typing.Union[MetaOapg.properties.integer, schemas.Unset]
-    int32: typing.Union[MetaOapg.properties.int32, schemas.Unset]
-    int32withValidations: typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]
-    int64: typing.Union[MetaOapg.properties.int64, schemas.Unset]
-    float32: typing.Union[MetaOapg.properties.float32, schemas.Unset]
-    double: typing.Union[MetaOapg.properties.double, schemas.Unset]
-    float64: typing.Union[MetaOapg.properties.float64, schemas.Unset]
-    arrayWithUniqueItems: typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]
-    string: typing.Union[MetaOapg.properties.string, schemas.Unset]
-    binary: typing.Union[MetaOapg.properties.binary, schemas.Unset]
-    dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
-    uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
-    uuidNoExample: typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]
-    pattern_with_digits: typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]
-    pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]
-    noneProp: typing.Union[MetaOapg.properties.noneProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
@@ -234,63 +218,134 @@ class FormatTest(
     def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int32withValidations"]) -> MetaOapg.properties.int32withValidations: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float32"]) -> MetaOapg.properties.float32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float64"]) -> MetaOapg.properties.float64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["arrayWithUniqueItems"]) -> MetaOapg.properties.arrayWithUniqueItems: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["uuidNoExample"]) -> MetaOapg.properties.uuidNoExample: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["pattern_with_digits"]) -> MetaOapg.properties.pattern_with_digits: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.properties.pattern_with_digits_and_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["noneProp"]) -> MetaOapg.properties.noneProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index 94ca0489a1b..a0cc0de9575 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -156,22 +156,6 @@ class FormatTest(
     number: MetaOapg.properties.number
     password: MetaOapg.properties.password
     byte: MetaOapg.properties.byte
-    integer: typing.Union[MetaOapg.properties.integer, schemas.Unset]
-    int32: typing.Union[MetaOapg.properties.int32, schemas.Unset]
-    int32withValidations: typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]
-    int64: typing.Union[MetaOapg.properties.int64, schemas.Unset]
-    float32: typing.Union[MetaOapg.properties.float32, schemas.Unset]
-    double: typing.Union[MetaOapg.properties.double, schemas.Unset]
-    float64: typing.Union[MetaOapg.properties.float64, schemas.Unset]
-    arrayWithUniqueItems: typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]
-    string: typing.Union[MetaOapg.properties.string, schemas.Unset]
-    binary: typing.Union[MetaOapg.properties.binary, schemas.Unset]
-    dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
-    uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
-    uuidNoExample: typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]
-    pattern_with_digits: typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]
-    pattern_with_digits_and_delimiter: typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]
-    noneProp: typing.Union[MetaOapg.properties.noneProp, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
@@ -186,63 +170,134 @@ class FormatTest(
     def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int32withValidations"]) -> MetaOapg.properties.int32withValidations: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float32"]) -> MetaOapg.properties.float32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float64"]) -> MetaOapg.properties.float64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["arrayWithUniqueItems"]) -> MetaOapg.properties.arrayWithUniqueItems: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["uuidNoExample"]) -> MetaOapg.properties.uuidNoExample: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["pattern_with_digits"]) -> MetaOapg.properties.pattern_with_digits: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.properties.pattern_with_digits_and_delimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["noneProp"]) -> MetaOapg.properties.noneProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int32withValidations"]) -> typing.Union[MetaOapg.properties.int32withValidations, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float32"]) -> typing.Union[MetaOapg.properties.float32, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["double"]) -> typing.Union[MetaOapg.properties.double, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float64"]) -> typing.Union[MetaOapg.properties.float64, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.properties.arrayWithUniqueItems, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.properties.uuidNoExample, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.properties.pattern_with_digits, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.properties.pattern_with_digits_and_delimiter, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["noneProp"]) -> typing.Union[MetaOapg.properties.noneProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 5511c8b8da6..19f929c7e17 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
@@ -56,18 +56,28 @@ class Fruit(
             ]
 
     
-    color: typing.Union[MetaOapg.properties.color, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 5511c8b8da6..19f929c7e17 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -56,18 +56,28 @@ class Fruit(
             ]
 
     
-    color: typing.Union[MetaOapg.properties.color, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 215fe6b5a5d..19410a47efb 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
@@ -56,18 +56,28 @@ class GmFruit(
             ]
 
     
-    color: typing.Union[MetaOapg.properties.color, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 215fe6b5a5d..19410a47efb 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -56,18 +56,28 @@ class GmFruit(
             ]
 
     
-    color: typing.Union[MetaOapg.properties.color, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["color", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["color"]) -> typing.Union[MetaOapg.properties.color, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index cbfdde5c730..e46b48a9e44 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -58,12 +58,23 @@ class GrandparentAnimal(
     def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["pet_type", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index cbfdde5c730..e46b48a9e44 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -58,12 +58,23 @@ class GrandparentAnimal(
     def __getitem__(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["pet_type", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pet_type"]) -> MetaOapg.properties.pet_type: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["pet_type", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index b8746de60bf..86adf681ee2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -41,22 +41,34 @@ class HasOnlyReadOnly(
                 "foo": foo,
             }
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index b8746de60bf..86adf681ee2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -41,22 +41,34 @@ class HasOnlyReadOnly(
                 "foo": foo,
             }
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 afe3f43aea9..0901ef53918 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
@@ -61,18 +61,28 @@ class HealthCheckResult(
                 "NullableMessage": NullableMessage,
             }
     
-    NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index afe3f43aea9..0901ef53918 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -61,18 +61,28 @@ class HealthCheckResult(
                 "NullableMessage": NullableMessage,
             }
     
-    NullableMessage: typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["NullableMessage"]) -> typing.Union[MetaOapg.properties.NullableMessage, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 70a79a04f7f..247161f73d4 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
@@ -61,18 +61,28 @@ class IsoscelesTriangle(
                         "triangleType": triangleType,
                     }
             
-            triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index 70a79a04f7f..247161f73d4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -61,18 +61,28 @@ class IsoscelesTriangle(
                         "triangleType": triangleType,
                     }
             
-            triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index 5c4f092a09e..e91a7435ec7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -55,6 +55,9 @@ class MapTest(
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
+                        
+                        def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                            return super().get_item_oapg(name)
                     
                         def __new__(
                             cls,
@@ -72,6 +75,9 @@ class MapTest(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -118,6 +124,9 @@ class MapTest(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -144,6 +153,9 @@ class MapTest(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -169,30 +181,46 @@ class MapTest(
                 "indirect_map": indirect_map,
             }
     
-    map_map_of_string: typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]
-    map_of_enum_string: typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]
-    direct_map: typing.Union[MetaOapg.properties.direct_map, schemas.Unset]
-    indirect_map: typing.Union['StringBooleanMap', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_of_enum_string"]) -> MetaOapg.properties.map_of_enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["direct_map"]) -> MetaOapg.properties.direct_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["indirect_map"]) -> 'StringBooleanMap': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index 5c4f092a09e..e91a7435ec7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -55,6 +55,9 @@ class MapTest(
                         def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
+                        
+                        def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                            return super().get_item_oapg(name)
                     
                         def __new__(
                             cls,
@@ -72,6 +75,9 @@ class MapTest(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -118,6 +124,9 @@ class MapTest(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -144,6 +153,9 @@ class MapTest(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -169,30 +181,46 @@ class MapTest(
                 "indirect_map": indirect_map,
             }
     
-    map_map_of_string: typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]
-    map_of_enum_string: typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]
-    direct_map: typing.Union[MetaOapg.properties.direct_map, schemas.Unset]
-    indirect_map: typing.Union['StringBooleanMap', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map_of_enum_string"]) -> MetaOapg.properties.map_of_enum_string: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["direct_map"]) -> MetaOapg.properties.direct_map: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["indirect_map"]) -> 'StringBooleanMap': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.properties.map_map_of_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.properties.map_of_enum_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["direct_map"]) -> typing.Union[MetaOapg.properties.direct_map, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["indirect_map"]) -> typing.Union['StringBooleanMap', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index 8a77aa04c91..c94c390ad0c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -53,6 +53,9 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> 'Animal':
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -72,26 +75,40 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "map": map,
             }
     
-    uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
-    dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
-    map: typing.Union[MetaOapg.properties.map, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map"]) -> MetaOapg.properties.map: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index 8a77aa04c91..c94c390ad0c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -53,6 +53,9 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> 'Animal':
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> 'Animal':
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -72,26 +75,40 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "map": map,
             }
     
-    uuid: typing.Union[MetaOapg.properties.uuid, schemas.Unset]
-    dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
-    map: typing.Union[MetaOapg.properties.map, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["map"]) -> MetaOapg.properties.map: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["uuid"]) -> typing.Union[MetaOapg.properties.uuid, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["map"]) -> typing.Union[MetaOapg.properties.map, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 022f6945603..c2c9d89c428 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
@@ -44,21 +44,34 @@ class Model200Response(
             }
 
     
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "class", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index 022f6945603..c2c9d89c428 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -44,21 +44,34 @@ class Model200Response(
             }
 
     
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["class"]) -> MetaOapg.properties._class: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "class", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["class"]) -> typing.Union[MetaOapg.properties._class, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "class", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 562588d1dc3..7c0c0720b45 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
@@ -44,15 +44,26 @@ class ModelReturn(
     
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["return"]) -> MetaOapg.properties._return: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["return", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index 562588d1dc3..7c0c0720b45 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -44,15 +44,26 @@ class ModelReturn(
     
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["return"]) -> MetaOapg.properties._return: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["return", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["return"]) -> typing.Union[MetaOapg.properties._return, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["return", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 364372e2a44..88174c369e8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -59,12 +59,26 @@ class Money(
     def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["amount"]) -> MetaOapg.properties.amount: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["currency"]) -> 'Currency': ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 364372e2a44..88174c369e8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -59,12 +59,26 @@ class Money(
     def __getitem__(self, name: typing.Literal["currency"]) -> 'Currency': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["amount"]) -> MetaOapg.properties.amount: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["currency"]) -> 'Currency': ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 978ebaa19b0..882051e0254 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
@@ -50,24 +50,40 @@ class Name(
 
     
     name: MetaOapg.properties.name
-    snake_case: typing.Union[MetaOapg.properties.snake_case, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["snake_case"]) -> MetaOapg.properties.snake_case: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["property"]) -> MetaOapg.properties._property: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 978ebaa19b0..882051e0254 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -50,24 +50,40 @@ class Name(
 
     
     name: MetaOapg.properties.name
-    snake_case: typing.Union[MetaOapg.properties.snake_case, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["snake_case"]) -> MetaOapg.properties.snake_case: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["property"]) -> MetaOapg.properties._property: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["snake_case"]) -> typing.Union[MetaOapg.properties.snake_case, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["property"]) -> typing.Union[MetaOapg.properties._property, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
index 70042463841..1df86a4a89c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py
@@ -46,17 +46,25 @@ class NoAdditionalProperties(
         additional_properties = schemas.NotAnyTypeSchema
     
     id: MetaOapg.properties.id
-    petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
index 70042463841..1df86a4a89c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.pyi
@@ -46,17 +46,25 @@ class NoAdditionalProperties(
         additional_properties = schemas.NotAnyTypeSchema
     
     id: MetaOapg.properties.id
-    petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id"], typing.Literal["petId"], ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 b2644be98d9..bc6de349b25 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
@@ -295,6 +295,9 @@ class NullableClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -348,6 +351,9 @@ class NullableClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -396,6 +402,9 @@ class NullableClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -447,54 +456,42 @@ class NullableClass(
                     **kwargs,
                 )
     
-    integer_prop: typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]
-    number_prop: typing.Union[MetaOapg.properties.number_prop, schemas.Unset]
-    boolean_prop: typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]
-    string_prop: typing.Union[MetaOapg.properties.string_prop, schemas.Unset]
-    date_prop: typing.Union[MetaOapg.properties.date_prop, schemas.Unset]
-    datetime_prop: typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]
-    array_nullable_prop: typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]
-    array_and_items_nullable_prop: typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]
-    array_items_nullable: typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]
-    object_nullable_prop: typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]
-    object_and_items_nullable_prop: typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]
-    object_items_nullable: typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["number_prop"]) -> MetaOapg.properties.number_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["boolean_prop"]) -> MetaOapg.properties.boolean_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string_prop"]) -> MetaOapg.properties.string_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["date_prop"]) -> MetaOapg.properties.date_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["datetime_prop"]) -> MetaOapg.properties.datetime_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_nullable_prop"]) -> MetaOapg.properties.array_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_and_items_nullable_prop"]) -> MetaOapg.properties.array_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_items_nullable"]) -> MetaOapg.properties.array_items_nullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["object_nullable_prop"]) -> MetaOapg.properties.object_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["object_and_items_nullable_prop"]) -> MetaOapg.properties.object_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["object_items_nullable"]) -> MetaOapg.properties.object_items_nullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
@@ -502,6 +499,48 @@ class NullableClass(
     def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index b2644be98d9..bc6de349b25 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -295,6 +295,9 @@ class NullableClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -348,6 +351,9 @@ class NullableClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -396,6 +402,9 @@ class NullableClass(
                 def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
+                
+                def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+                    return super().get_item_oapg(name)
             
                 def __new__(
                     cls,
@@ -447,54 +456,42 @@ class NullableClass(
                     **kwargs,
                 )
     
-    integer_prop: typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]
-    number_prop: typing.Union[MetaOapg.properties.number_prop, schemas.Unset]
-    boolean_prop: typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]
-    string_prop: typing.Union[MetaOapg.properties.string_prop, schemas.Unset]
-    date_prop: typing.Union[MetaOapg.properties.date_prop, schemas.Unset]
-    datetime_prop: typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]
-    array_nullable_prop: typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]
-    array_and_items_nullable_prop: typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]
-    array_items_nullable: typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]
-    object_nullable_prop: typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]
-    object_and_items_nullable_prop: typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]
-    object_items_nullable: typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["number_prop"]) -> MetaOapg.properties.number_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["boolean_prop"]) -> MetaOapg.properties.boolean_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string_prop"]) -> MetaOapg.properties.string_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["date_prop"]) -> MetaOapg.properties.date_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["datetime_prop"]) -> MetaOapg.properties.datetime_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_nullable_prop"]) -> MetaOapg.properties.array_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_and_items_nullable_prop"]) -> MetaOapg.properties.array_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["array_items_nullable"]) -> MetaOapg.properties.array_items_nullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["object_nullable_prop"]) -> MetaOapg.properties.object_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["object_and_items_nullable_prop"]) -> MetaOapg.properties.object_and_items_nullable_prop: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["object_items_nullable"]) -> MetaOapg.properties.object_items_nullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
@@ -502,6 +499,48 @@ class NullableClass(
     def __getitem__(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["integer_prop"]) -> typing.Union[MetaOapg.properties.integer_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["number_prop"]) -> typing.Union[MetaOapg.properties.number_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["boolean_prop"]) -> typing.Union[MetaOapg.properties.boolean_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string_prop"]) -> typing.Union[MetaOapg.properties.string_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["date_prop"]) -> typing.Union[MetaOapg.properties.date_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["datetime_prop"]) -> typing.Union[MetaOapg.properties.datetime_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.array_and_items_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.properties.array_items_nullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.properties.object_and_items_nullable_prop, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.properties.object_items_nullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["integer_prop"], typing.Literal["number_prop"], typing.Literal["boolean_prop"], typing.Literal["string_prop"], typing.Literal["date_prop"], typing.Literal["datetime_prop"], typing.Literal["array_nullable_prop"], typing.Literal["array_and_items_nullable_prop"], typing.Literal["array_items_nullable"], typing.Literal["object_nullable_prop"], typing.Literal["object_and_items_nullable_prop"], typing.Literal["object_items_nullable"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index f2e5ba29ed6..18552d50a92 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -39,18 +39,28 @@ class NumberOnly(
                 "JustNumber": JustNumber,
             }
     
-    JustNumber: typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index f2e5ba29ed6..18552d50a92 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -39,18 +39,28 @@ class NumberOnly(
                 "JustNumber": JustNumber,
             }
     
-    JustNumber: typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["JustNumber"]) -> typing.Union[MetaOapg.properties.JustNumber, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index d743c9fec0e..5b913e718ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -49,26 +49,40 @@ class ObjectModelWithRefProps(
                 "myBoolean": myBoolean,
             }
     
-    myNumber: typing.Union['NumberWithValidations', schemas.Unset]
-    myString: typing.Union[MetaOapg.properties.myString, schemas.Unset]
-    myBoolean: typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["myNumber"]) -> 'NumberWithValidations': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["myString"]) -> MetaOapg.properties.myString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["myBoolean"]) -> MetaOapg.properties.myBoolean: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index d743c9fec0e..5b913e718ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -49,26 +49,40 @@ class ObjectModelWithRefProps(
                 "myBoolean": myBoolean,
             }
     
-    myNumber: typing.Union['NumberWithValidations', schemas.Unset]
-    myString: typing.Union[MetaOapg.properties.myString, schemas.Unset]
-    myBoolean: typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["myNumber"]) -> 'NumberWithValidations': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["myString"]) -> MetaOapg.properties.myString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["myBoolean"]) -> MetaOapg.properties.myBoolean: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["myNumber"]) -> typing.Union['NumberWithValidations', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["myString"]) -> typing.Union[MetaOapg.properties.myString, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["myBoolean"]) -> typing.Union[MetaOapg.properties.myBoolean, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index f3392173c0a..951e29818bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -47,26 +47,40 @@ class ObjectWithDecimalProperties(
                 "cost": cost,
             }
     
-    length: typing.Union[MetaOapg.properties.length, schemas.Unset]
-    width: typing.Union[MetaOapg.properties.width, schemas.Unset]
-    cost: typing.Union['Money', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["length"]) -> MetaOapg.properties.length: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["width"]) -> MetaOapg.properties.width: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["cost"]) -> 'Money': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index f3392173c0a..951e29818bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -47,26 +47,40 @@ class ObjectWithDecimalProperties(
                 "cost": cost,
             }
     
-    length: typing.Union[MetaOapg.properties.length, schemas.Unset]
-    width: typing.Union[MetaOapg.properties.width, schemas.Unset]
-    cost: typing.Union['Money', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["length"]) -> MetaOapg.properties.length: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["width"]) -> MetaOapg.properties.width: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["cost"]) -> 'Money': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["length"]) -> typing.Union[MetaOapg.properties.length, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["width"]) -> typing.Union[MetaOapg.properties.width, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["cost"]) -> typing.Union['Money', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index d766625653e..a2c526f97d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -53,18 +53,35 @@ class ObjectWithDifficultlyNamedProps(
     def __getitem__(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["$special[property.name]"]) -> MetaOapg.properties.special_property_name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["123Number"]) -> MetaOapg.properties._123_number: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index d766625653e..a2c526f97d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -53,18 +53,35 @@ class ObjectWithDifficultlyNamedProps(
     def __getitem__(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["$special[property.name]"]) -> MetaOapg.properties.special_property_name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["123Number"]) -> MetaOapg.properties._123_number: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["123-list"]) -> MetaOapg.properties._123_list: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.properties.special_property_name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["123Number"]) -> typing.Union[MetaOapg.properties._123_number, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 75317e02efb..48079bb3b7e 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
@@ -84,18 +84,28 @@ class ObjectWithInlineCompositionProperty(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 93b7e4d24c5..b6e5f3fde22 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -81,18 +81,28 @@ class ObjectWithInlineCompositionProperty(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index aa876471e89..313cdc78dd6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -75,38 +75,58 @@ class Order(
                 "complete": complete,
             }
     
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
-    quantity: typing.Union[MetaOapg.properties.quantity, schemas.Unset]
-    shipDate: typing.Union[MetaOapg.properties.shipDate, schemas.Unset]
-    status: typing.Union[MetaOapg.properties.status, schemas.Unset]
-    complete: typing.Union[MetaOapg.properties.complete, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["quantity"]) -> MetaOapg.properties.quantity: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["shipDate"]) -> MetaOapg.properties.shipDate: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["complete"]) -> MetaOapg.properties.complete: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index aa876471e89..313cdc78dd6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -75,38 +75,58 @@ class Order(
                 "complete": complete,
             }
     
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    petId: typing.Union[MetaOapg.properties.petId, schemas.Unset]
-    quantity: typing.Union[MetaOapg.properties.quantity, schemas.Unset]
-    shipDate: typing.Union[MetaOapg.properties.shipDate, schemas.Unset]
-    status: typing.Union[MetaOapg.properties.status, schemas.Unset]
-    complete: typing.Union[MetaOapg.properties.complete, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["petId"]) -> MetaOapg.properties.petId: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["quantity"]) -> MetaOapg.properties.quantity: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["shipDate"]) -> MetaOapg.properties.shipDate: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["complete"]) -> MetaOapg.properties.complete: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["petId"]) -> typing.Union[MetaOapg.properties.petId, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["quantity"]) -> typing.Union[MetaOapg.properties.quantity, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shipDate"]) -> typing.Union[MetaOapg.properties.shipDate, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["complete"]) -> typing.Union[MetaOapg.properties.complete, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 7e8b729b2ef..06b9e159599 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
@@ -135,10 +135,6 @@ class Pet(
     
     photoUrls: MetaOapg.properties.photoUrls
     name: MetaOapg.properties.name
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    category: typing.Union['Category', schemas.Unset]
-    tags: typing.Union[MetaOapg.properties.tags, schemas.Unset]
-    status: typing.Union[MetaOapg.properties.status, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
@@ -147,24 +143,50 @@ class Pet(
     def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["category"]) -> 'Category': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["tags"]) -> MetaOapg.properties.tags: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index 7e8b729b2ef..06b9e159599 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -135,10 +135,6 @@ class Pet(
     
     photoUrls: MetaOapg.properties.photoUrls
     name: MetaOapg.properties.name
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    category: typing.Union['Category', schemas.Unset]
-    tags: typing.Union[MetaOapg.properties.tags, schemas.Unset]
-    status: typing.Union[MetaOapg.properties.status, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
@@ -147,24 +143,50 @@ class Pet(
     def __getitem__(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["category"]) -> 'Category': ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["tags"]) -> MetaOapg.properties.tags: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["photoUrls"]) -> MetaOapg.properties.photoUrls: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["category"]) -> typing.Union['Category', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["tags"]) -> typing.Union[MetaOapg.properties.tags, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 3e461c701cb..2faee99c856 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -47,22 +47,34 @@ class Player(
                 "enemyPlayer": enemyPlayer,
             }
     
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
-    enemyPlayer: typing.Union['Player', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> 'Player': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 3e461c701cb..2faee99c856 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -47,22 +47,34 @@ class Player(
                 "enemyPlayer": enemyPlayer,
             }
     
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
-    enemyPlayer: typing.Union['Player', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enemyPlayer"]) -> 'Player': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 5730f45d974..5d184afa646 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
@@ -70,12 +70,26 @@ class QuadrilateralInterface(
     def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 5730f45d974..5d184afa646 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -70,12 +70,26 @@ class QuadrilateralInterface(
     def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index 099178f95d5..f018cc01874 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -41,22 +41,34 @@ class ReadOnlyFirst(
                 "baz": baz,
             }
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    baz: typing.Union[MetaOapg.properties.baz, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index 099178f95d5..f018cc01874 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -41,22 +41,34 @@ class ReadOnlyFirst(
                 "baz": baz,
             }
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    baz: typing.Union[MetaOapg.properties.baz, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["baz"]) -> typing.Union[MetaOapg.properties.baz, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 654fec85fbf..3cf568d5100 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
@@ -61,18 +61,28 @@ class ScaleneTriangle(
                         "triangleType": triangleType,
                     }
             
-            triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 654fec85fbf..3cf568d5100 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -61,18 +61,28 @@ class ScaleneTriangle(
                         "triangleType": triangleType,
                     }
             
-            triangleType: typing.Union[MetaOapg.properties.triangleType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["triangleType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["triangleType"]) -> typing.Union[MetaOapg.properties.triangleType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
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 be10897bc19..0c27353530d 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
@@ -61,18 +61,28 @@ class SimpleQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index be10897bc19..0c27353530d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -61,18 +61,28 @@ class SimpleQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            quadrilateralType: typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
             def __getitem__(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
                 # dict_instance[name] accessor
                 return super().__getitem__(name)
             
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.properties.quadrilateralType, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
+                # dict_instance[name] accessor
+                return super().__getitem__(name)
+            
         
             def __new__(
                 cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 01abd68cc72..a5dddd05fe2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -41,18 +41,28 @@ class SpecialModelName(
                 "a": a,
             }
     
-    a: typing.Union[MetaOapg.properties.a, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["a"]) -> MetaOapg.properties.a: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 01abd68cc72..a5dddd05fe2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -41,18 +41,28 @@ class SpecialModelName(
                 "a": a,
             }
     
-    a: typing.Union[MetaOapg.properties.a, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["a"]) -> MetaOapg.properties.a: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union[MetaOapg.properties.a, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
index 449dc068050..1bc5f574999 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.py
@@ -38,6 +38,9 @@ class StringBooleanMap(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
index 449dc068050..1bc5f574999 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/string_boolean_map.pyi
@@ -38,6 +38,9 @@ class StringBooleanMap(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index 4bc7d5ab9de..c7f6228f11d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -41,22 +41,34 @@ class Tag(
                 "name": name,
             }
     
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "name", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index 4bc7d5ab9de..c7f6228f11d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -41,22 +41,34 @@ class Tag(
                 "name": name,
             }
     
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "name", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "name", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 961d18aa548..d1484a6efd3 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
@@ -70,12 +70,26 @@ class TriangleInterface(
     def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index 961d18aa548..d1484a6efd3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -70,12 +70,26 @@ class TriangleInterface(
     def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["shapeType"]) -> MetaOapg.properties.shapeType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 c3c74479086..54bd17c4ae3 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
@@ -107,66 +107,100 @@ class User(
                 "anyTypePropNullable": anyTypePropNullable,
             }
     
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    username: typing.Union[MetaOapg.properties.username, schemas.Unset]
-    firstName: typing.Union[MetaOapg.properties.firstName, schemas.Unset]
-    lastName: typing.Union[MetaOapg.properties.lastName, schemas.Unset]
-    email: typing.Union[MetaOapg.properties.email, schemas.Unset]
-    password: typing.Union[MetaOapg.properties.password, schemas.Unset]
-    phone: typing.Union[MetaOapg.properties.phone, schemas.Unset]
-    userStatus: typing.Union[MetaOapg.properties.userStatus, schemas.Unset]
-    objectWithNoDeclaredProps: typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]
-    objectWithNoDeclaredPropsNullable: typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]
-    anyTypeProp: typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]
-    anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]
-    anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["username"]) -> MetaOapg.properties.username: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["firstName"]) -> MetaOapg.properties.firstName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["lastName"]) -> MetaOapg.properties.lastName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["email"]) -> MetaOapg.properties.email: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["phone"]) -> MetaOapg.properties.phone: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["userStatus"]) -> MetaOapg.properties.userStatus: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.properties.objectWithNoDeclaredProps: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.properties.objectWithNoDeclaredPropsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anyTypeProp"]) -> MetaOapg.properties.anyTypeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anyTypeExceptNullProp"]) -> MetaOapg.properties.anyTypeExceptNullProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> MetaOapg.properties.anyTypePropNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index c3c74479086..54bd17c4ae3 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -107,66 +107,100 @@ class User(
                 "anyTypePropNullable": anyTypePropNullable,
             }
     
-    id: typing.Union[MetaOapg.properties.id, schemas.Unset]
-    username: typing.Union[MetaOapg.properties.username, schemas.Unset]
-    firstName: typing.Union[MetaOapg.properties.firstName, schemas.Unset]
-    lastName: typing.Union[MetaOapg.properties.lastName, schemas.Unset]
-    email: typing.Union[MetaOapg.properties.email, schemas.Unset]
-    password: typing.Union[MetaOapg.properties.password, schemas.Unset]
-    phone: typing.Union[MetaOapg.properties.phone, schemas.Unset]
-    userStatus: typing.Union[MetaOapg.properties.userStatus, schemas.Unset]
-    objectWithNoDeclaredProps: typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]
-    objectWithNoDeclaredPropsNullable: typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]
-    anyTypeProp: typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]
-    anyTypeExceptNullProp: typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]
-    anyTypePropNullable: typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["username"]) -> MetaOapg.properties.username: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["firstName"]) -> MetaOapg.properties.firstName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["lastName"]) -> MetaOapg.properties.lastName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["email"]) -> MetaOapg.properties.email: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["phone"]) -> MetaOapg.properties.phone: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["userStatus"]) -> MetaOapg.properties.userStatus: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.properties.objectWithNoDeclaredProps: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.properties.objectWithNoDeclaredPropsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anyTypeProp"]) -> MetaOapg.properties.anyTypeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anyTypeExceptNullProp"]) -> MetaOapg.properties.anyTypeExceptNullProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["anyTypePropNullable"]) -> MetaOapg.properties.anyTypePropNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["id"]) -> typing.Union[MetaOapg.properties.id, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["username"]) -> typing.Union[MetaOapg.properties.username, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["firstName"]) -> typing.Union[MetaOapg.properties.firstName, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["lastName"]) -> typing.Union[MetaOapg.properties.lastName, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["email"]) -> typing.Union[MetaOapg.properties.email, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["phone"]) -> typing.Union[MetaOapg.properties.phone, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["userStatus"]) -> typing.Union[MetaOapg.properties.userStatus, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredProps, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.properties.objectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.properties.anyTypeProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.properties.anyTypeExceptNullProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.properties.anyTypePropNullable, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 4ff548e605e..5e389d69f24 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
@@ -61,25 +61,40 @@ class Whale(
             }
     
     className: MetaOapg.properties.className
-    hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]
-    hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["hasBaleen"]) -> MetaOapg.properties.hasBaleen: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["hasTeeth"]) -> MetaOapg.properties.hasTeeth: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index 4ff548e605e..5e389d69f24 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -61,25 +61,40 @@ class Whale(
             }
     
     className: MetaOapg.properties.className
-    hasBaleen: typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]
-    hasTeeth: typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["hasBaleen"]) -> MetaOapg.properties.hasBaleen: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["hasTeeth"]) -> MetaOapg.properties.hasTeeth: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["hasBaleen"]) -> typing.Union[MetaOapg.properties.hasBaleen, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["hasTeeth"]) -> typing.Union[MetaOapg.properties.hasTeeth, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     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 787d981d2fe..e6e2e041201 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
@@ -86,13 +86,12 @@ class Zebra(
         additional_properties = schemas.AnyTypeSchema
     
     className: MetaOapg.properties.className
-    type: typing.Union[MetaOapg.properties.type, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
@@ -100,6 +99,18 @@ class Zebra(
     def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
index 787d981d2fe..e6e2e041201 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/zebra.pyi
@@ -86,13 +86,12 @@ class Zebra(
         additional_properties = schemas.AnyTypeSchema
     
     className: MetaOapg.properties.className
-    type: typing.Union[MetaOapg.properties.type, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["type"]) -> MetaOapg.properties.type: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
@@ -100,6 +99,18 @@ class Zebra(
     def __getitem__(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["className"]) -> MetaOapg.properties.className: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["type"]) -> typing.Union[MetaOapg.properties.type, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["className"], typing.Literal["type"], str, ]):
+        return super().get_item_oapg(name)
 
     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 c5d7bbb5e6f..6709434a7d5 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
@@ -152,36 +152,27 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter
     byte: MetaOapg.properties.byte
     double: MetaOapg.properties.double
-    integer: typing.Union[MetaOapg.properties.integer, schemas.Unset]
-    int32: typing.Union[MetaOapg.properties.int32, schemas.Unset]
-    int64: typing.Union[MetaOapg.properties.int64, schemas.Unset]
-    string: typing.Union[MetaOapg.properties.string, schemas.Unset]
-    binary: typing.Union[MetaOapg.properties.binary, schemas.Unset]
-    date: typing.Union[MetaOapg.properties.date, schemas.Unset]
-    dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
-    password: typing.Union[MetaOapg.properties.password, schemas.Unset]
-    callback: typing.Union[MetaOapg.properties.callback, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
@@ -190,27 +181,77 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["callback"]) -> MetaOapg.properties.callback: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index a42b6a0e450..47f55c63856 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -114,36 +114,27 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     pattern_without_delimiter: MetaOapg.properties.pattern_without_delimiter
     byte: MetaOapg.properties.byte
     double: MetaOapg.properties.double
-    integer: typing.Union[MetaOapg.properties.integer, schemas.Unset]
-    int32: typing.Union[MetaOapg.properties.int32, schemas.Unset]
-    int64: typing.Union[MetaOapg.properties.int64, schemas.Unset]
-    string: typing.Union[MetaOapg.properties.string, schemas.Unset]
-    binary: typing.Union[MetaOapg.properties.binary, schemas.Unset]
-    date: typing.Union[MetaOapg.properties.date, schemas.Unset]
-    dateTime: typing.Union[MetaOapg.properties.dateTime, schemas.Unset]
-    password: typing.Union[MetaOapg.properties.password, schemas.Unset]
-    callback: typing.Union[MetaOapg.properties.callback, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["integer"]) -> MetaOapg.properties.integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int32"]) -> MetaOapg.properties.int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["int64"]) -> MetaOapg.properties.int64: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["float"]) -> MetaOapg.properties._float: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> MetaOapg.properties.string: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
@@ -152,27 +143,77 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def __getitem__(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["binary"]) -> MetaOapg.properties.binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["date"]) -> MetaOapg.properties.date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["dateTime"]) -> MetaOapg.properties.dateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["password"]) -> MetaOapg.properties.password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["callback"]) -> MetaOapg.properties.callback: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["integer"]) -> typing.Union[MetaOapg.properties.integer, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int32"]) -> typing.Union[MetaOapg.properties.int32, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["int64"]) -> typing.Union[MetaOapg.properties.int64, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["number"]) -> MetaOapg.properties.number: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["float"]) -> typing.Union[MetaOapg.properties._float, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["double"]) -> MetaOapg.properties.double: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union[MetaOapg.properties.string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["pattern_without_delimiter"]) -> MetaOapg.properties.pattern_without_delimiter: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["byte"]) -> MetaOapg.properties.byte: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["binary"]) -> typing.Union[MetaOapg.properties.binary, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["date"]) -> typing.Union[MetaOapg.properties.date, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["dateTime"]) -> typing.Union[MetaOapg.properties.dateTime, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["password"]) -> typing.Union[MetaOapg.properties.password, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["callback"]) -> typing.Union[MetaOapg.properties.callback, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 ee4b9c41a4f..35389b4b27d 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
@@ -368,22 +368,34 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string": enum_form_string,
             }
     
-    enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]
-    enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_form_string"]) -> MetaOapg.properties.enum_form_string: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 087daec266a..39db2f18454 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -292,22 +292,34 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string": enum_form_string,
             }
     
-    enum_form_string_array: typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]
-    enum_form_string: typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["enum_form_string"]) -> MetaOapg.properties.enum_form_string: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.properties.enum_form_string_array, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["enum_form_string"]) -> typing.Union[MetaOapg.properties.enum_form_string, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
index a492cd298af..dec8f7350f2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.py
@@ -39,6 +39,9 @@ class SchemaForRequestBodyApplicationJson(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
index ec9a4656217..52811878342 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_additional_properties/post.pyi
@@ -37,6 +37,9 @@ class SchemaForRequestBodyApplicationJson(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 0f768dc7401..9e26b7bcfae 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
@@ -131,18 +131,28 @@ class CompositionInPropertySchema(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
@@ -295,18 +305,28 @@ class SchemaForRequestBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
@@ -437,18 +457,28 @@ class SchemaFor200ResponseBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 2019a74679b..c7498d841e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -123,18 +123,28 @@ class CompositionInPropertySchema(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
@@ -250,18 +260,28 @@ class SchemaForRequestBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
@@ -376,18 +396,28 @@ class SchemaFor200ResponseBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    someProp: typing.Union[MetaOapg.properties.someProp, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["someProp", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["someProp"]) -> typing.Union[MetaOapg.properties.someProp, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index 7a54dea109c..f546e7d9115 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -56,12 +56,26 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["param"]) -> MetaOapg.properties.param: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index 11509c203bc..c668488d279 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -54,12 +54,26 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def __getitem__(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["param"]) -> MetaOapg.properties.param: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["param2"]) -> MetaOapg.properties.param2: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index dfb2ab0ce94..b8c4cdee99c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -39,18 +39,28 @@ class MapBeanSchema(
                 "keyword": keyword,
             }
     
-    keyword: typing.Union[MetaOapg.properties.keyword, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["keyword", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index 3fee4be3958..5b1e8eaef5b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -37,18 +37,28 @@ class MapBeanSchema(
                 "keyword": keyword,
             }
     
-    keyword: typing.Union[MetaOapg.properties.keyword, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["keyword", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["keyword"]) -> typing.Union[MetaOapg.properties.keyword, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["keyword", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 31757d35db1..ebc4a941f59 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
@@ -74,21 +74,34 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     requiredFile: MetaOapg.properties.requiredFile
-    additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index ed2deb08ac8..e72ac18ed4b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -48,21 +48,34 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     requiredFile: MetaOapg.properties.requiredFile
-    additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["requiredFile"]) -> MetaOapg.properties.requiredFile: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
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 9ad73baa38a..f415b8308c2 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
@@ -48,21 +48,34 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     file: MetaOapg.properties.file
-    additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index fdf28f3be55..952de2a085f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -46,21 +46,34 @@ class SchemaForRequestBodyMultipartFormData(
             }
     
     file: MetaOapg.properties.file
-    additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     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 358dabb5c3f..55ce2d36417 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
@@ -64,18 +64,28 @@ class SchemaForRequestBodyMultipartFormData(
                 "files": files,
             }
     
-    files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["files", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 0948576aab9..84d4adb07fc 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -62,18 +62,28 @@ class SchemaForRequestBodyMultipartFormData(
                 "files": files,
             }
     
-    files: typing.Union[MetaOapg.properties.files, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["files", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["files"]) -> typing.Union[MetaOapg.properties.files, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["files", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index f219e6a6f7e..321980d83bf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -45,18 +45,28 @@ class SchemaFor0ResponseBodyApplicationJson(
                 "string": string,
             }
     
-    string: typing.Union['Foo', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> 'Foo': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["string", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index a8c90bdb8f2..63a0fb82c5b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -43,18 +43,28 @@ class SchemaFor0ResponseBodyApplicationJson(
                 "string": string,
             }
     
-    string: typing.Union['Foo', schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["string"]) -> 'Foo': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["string", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["string"]) -> typing.Union['Foo', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["string", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index c0e07db9491..abdd85044e1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -68,22 +68,34 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "status": status,
             }
     
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
-    status: typing.Union[MetaOapg.properties.status, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "status", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index 3f2ebe45adf..93362ca4fe7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -42,22 +42,34 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "status": status,
             }
     
-    name: typing.Union[MetaOapg.properties.name, schemas.Unset]
-    status: typing.Union[MetaOapg.properties.status, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["status"]) -> MetaOapg.properties.status: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["name", "status", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["name"]) -> typing.Union[MetaOapg.properties.name, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["status"]) -> typing.Union[MetaOapg.properties.status, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["name", "status", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 5b5b1672cf2..c01bfbf6c2c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -70,22 +70,34 @@ class SchemaForRequestBodyMultipartFormData(
                 "file": file,
             }
     
-    additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
-    file: typing.Union[MetaOapg.properties.file, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index b3a64f4495f..45757f6148c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -44,22 +44,34 @@ class SchemaForRequestBodyMultipartFormData(
                 "file": file,
             }
     
-    additionalMetadata: typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]
-    file: typing.Union[MetaOapg.properties.file, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["file"]) -> MetaOapg.properties.file: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
     def __getitem__(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.properties.additionalMetadata, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["file"]) -> typing.Union[MetaOapg.properties.file, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+    
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
index 93087b7d00c..2bb99bb0713 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.py
@@ -41,6 +41,9 @@ class SchemaFor200ResponseBodyApplicationJson(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
index 447adf9fdbe..46c770f5d3d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/store_inventory/get.pyi
@@ -36,6 +36,9 @@ class SchemaFor200ResponseBodyApplicationJson(
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 6d2d71f4e2a..91489367844 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -1570,30 +1570,32 @@ class DictBase(Discriminable, ValidatorBase):
         if not isinstance(self, FileIO):
             raise AttributeError('property setting not supported on immutable instances')
 
-    def __getattr__(self, name: str):
+    def __getattr__(self, name: str) typing.Union['AnyTypeSchema']:
         """
         for instance.name access
-
-        For type hints to accurately show that properties are optional
-        - values that do not exist in the dict but are present in properties must NOT throw AttributeError
-        - values that are not known about can throw AttributeErrors
+        Properties are only type hinted for required properties
+        so that hasattr(instance, 'optionalProp') is False when that key is not present
         """
         if not isinstance(self, frozendict.frozendict):
             return super().__getattr__(name)
-        # if an attribute does not exist
-        attribute_error = AttributeError(f"'{self}' has no attribute '{name}'")
         try:
             value = self[name]
-        except KeyError as _ex:
-            raise attribute_error
-        return value
+        except KeyError as ex:
+            raise AttributeError(str(ex))
 
-    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
-        # dict_instance[name] accessor
+    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema']:
+        """
+        dict_instance[name] accessor
+        key errors thrown
+        """
         if not isinstance(self, frozendict.frozendict):
             return super().__getattr__(name)
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
+        return super().__getitem__(name)
+
+    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+        # dict_instance[name] accessor
+        if not isinstance(self, frozendict.frozendict):
+            raise NotImplementedError()
         try:
             return super().__getitem__(name)
         except KeyError:
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
index 0d679f2cbaf..44d6fa701bc 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
@@ -15,18 +15,12 @@ import petstore_api
 from petstore_api.model import apple
 from petstore_api.model import banana
 from petstore_api.model.fruit import Fruit
-from petstore_api.schemas import Singleton
+from petstore_api import schemas
 
 
 class TestFruit(unittest.TestCase):
     """Fruit unit test stubs"""
 
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
     def testFruit(self):
         """Test Fruit"""
 
@@ -55,30 +49,9 @@ class TestFruit(unittest.TestCase):
         with self.assertRaises(TypeError):
             fruit['color'] = 'some value'
 
-        # Assert that we can call the builtin hasattr() function.
-        # hasattr should return False for non-existent attribute.
-        # Internally hasattr catches the AttributeError exception.
-        self.assertFalse(hasattr(fruit, 'invalid_variable'))
-
-        # Assert that we can call the builtin hasattr() function.
-        # hasattr should return True for existent attribute.
-        self.assertTrue(hasattr(fruit, 'color'))
-
         # getting a value that doesn't exist raises an exception
         # with a key
-        with self.assertRaises(KeyError):
-            fruit['cultivar']
-        # with getattr
-        # Per Python doc, if the named attribute does not exist,
-        # default is returned if provided.
-        self.assertEqual(getattr(fruit, 'cultivar', 'some value'), 'some value')
-        self.assertEqual(fruit.get('cultivar'), None)
-        self.assertEqual(fruit.get('cultivar', 'some value'), 'some value')
-
-        # Per Python doc, if the named attribute does not exist,
-        # default is returned if provided, otherwise AttributeError is raised.
-        with self.assertRaises(AttributeError):
-            getattr(fruit, 'cultivar')
+        assert fruit['cultivar'] is schemas.unset
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
@@ -143,7 +116,7 @@ class TestFruit(unittest.TestCase):
     def testFruitNullValue(self):
         # Since 'apple' is nullable, validate we can create an apple with the 'null' value.
         fruit = apple.Apple(None)
-        assert isinstance(fruit, Singleton)
+        assert isinstance(fruit, schemas.Singleton)
         assert isinstance(fruit, apple.Apple)
         assert fruit.is_none_oapg() is True
 
@@ -155,7 +128,7 @@ class TestFruit(unittest.TestCase):
         # Since 'fruit' has oneOf 'apple', 'banana' and 'apple' is nullable,
         # validate we can create a fruit with the 'null' value.
         fruit = Fruit(None)
-        assert isinstance(fruit, Singleton)
+        assert isinstance(fruit, schemas.Singleton)
         assert isinstance(fruit, apple.Apple)
         assert isinstance(fruit, Fruit)
         assert fruit.is_none_oapg() is True
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
index de0c56003d4..55c1d761ed6 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
@@ -16,7 +16,7 @@ import petstore_api
 from petstore_api.model import apple_req
 from petstore_api.model import banana_req
 from petstore_api.model.fruit_req import FruitReq
-from petstore_api.schemas import NoneSchema, Singleton
+from petstore_api import schemas
 
 
 class TestFruitReq(unittest.TestCase):
@@ -56,20 +56,19 @@ class TestFruitReq(unittest.TestCase):
 
         # getting a value that doesn't exist raises an exception
         # with a key
-        with self.assertRaises(KeyError):
-            fruit['cultivar']
+        cultivar_value = fruit['cultivar']
+        assert cultivar_value is schemas.unset
 
         # with getattr
         self.assertEqual(getattr(fruit, 'cultivar', 'some value'), 'some value')
 
-        with self.assertRaises(AttributeError):
-            getattr(fruit, 'cultivar')
+        assert getattr(fruit, 'cultivar') is schemas.unset
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
             FruitReq.MetaOapg.one_of,
             [
-                NoneSchema,
+                schemas.NoneSchema,
                 apple_req.AppleReq,
                 banana_req.BananaReq,
             ],
@@ -107,9 +106,9 @@ class TestFruitReq(unittest.TestCase):
 
         # we can pass in None
         fruit = FruitReq(None)
-        assert isinstance(fruit, Singleton)
+        assert isinstance(fruit, schemas.Singleton)
         assert isinstance(fruit, FruitReq)
-        assert isinstance(fruit, NoneSchema)
+        assert isinstance(fruit, schemas.NoneSchema)
         assert fruit.is_none_oapg() is True
 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
index cd21e88f18e..46b80ef59f4 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
@@ -62,9 +62,7 @@ class TestGmFruit(unittest.TestCase):
         # known variable from Apple is unset if it is not in the payload
         fruit_origin_by_get_item = fruit["origin"]
         assert fruit_origin_by_get_item is schemas.unset
-        with self.assertRaises(AttributeError):
-            fruit.origin
-        assert hasattr(fruit, 'origin') is False
+        assert fruit.origin is schemas.unset
 
         unknown_variable = fruit['unknown_variable']
         assert unknown_variable is schemas.unset
-- 
GitLab


From 3f8d15c1ae460a2e5ca67a7bab06690037648123 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 17:24:47 -0700
Subject: [PATCH 17/30] Sample regenrated

---
 .../property_getitems_without_addprops.handlebars        | 3 +--
 .../resources/python-experimental/schemas.handlebars     | 6 ++++--
 .../petstore_api/model/additional_properties_class.py    | 3 +--
 .../petstore_api/model/additional_properties_class.pyi   | 3 +--
 .../python-experimental/petstore_api/model/animal.py     | 3 +--
 .../python-experimental/petstore_api/model/animal.pyi    | 3 +--
 .../petstore_api/model/api_response.py                   | 3 +--
 .../petstore_api/model/api_response.pyi                  | 3 +--
 .../python-experimental/petstore_api/model/apple.py      | 3 +--
 .../python-experimental/petstore_api/model/apple.pyi     | 3 +--
 .../petstore_api/model/array_of_array_of_number_only.py  | 3 +--
 .../petstore_api/model/array_of_array_of_number_only.pyi | 3 +--
 .../petstore_api/model/array_of_number_only.py           | 3 +--
 .../petstore_api/model/array_of_number_only.pyi          | 3 +--
 .../python-experimental/petstore_api/model/array_test.py | 3 +--
 .../petstore_api/model/array_test.pyi                    | 3 +--
 .../python-experimental/petstore_api/model/banana.py     | 3 +--
 .../python-experimental/petstore_api/model/banana.pyi    | 3 +--
 .../python-experimental/petstore_api/model/basque_pig.py | 3 +--
 .../petstore_api/model/basque_pig.pyi                    | 3 +--
 .../petstore_api/model/capitalization.py                 | 3 +--
 .../petstore_api/model/capitalization.pyi                | 3 +--
 .../python-experimental/petstore_api/model/cat.py        | 3 +--
 .../python-experimental/petstore_api/model/cat.pyi       | 3 +--
 .../python-experimental/petstore_api/model/category.py   | 3 +--
 .../python-experimental/petstore_api/model/category.pyi  | 3 +--
 .../python-experimental/petstore_api/model/child_cat.py  | 3 +--
 .../python-experimental/petstore_api/model/child_cat.pyi | 3 +--
 .../petstore_api/model/class_model.py                    | 3 +--
 .../petstore_api/model/class_model.pyi                   | 3 +--
 .../python-experimental/petstore_api/model/client.py     | 3 +--
 .../python-experimental/petstore_api/model/client.pyi    | 3 +--
 .../petstore_api/model/complex_quadrilateral.py          | 3 +--
 .../petstore_api/model/complex_quadrilateral.pyi         | 3 +--
 .../python-experimental/petstore_api/model/danish_pig.py | 3 +--
 .../petstore_api/model/danish_pig.pyi                    | 3 +--
 .../python-experimental/petstore_api/model/dog.py        | 3 +--
 .../python-experimental/petstore_api/model/dog.pyi       | 3 +--
 .../petstore_api/model/enum_arrays.py                    | 3 +--
 .../petstore_api/model/enum_arrays.pyi                   | 3 +--
 .../python-experimental/petstore_api/model/enum_test.py  | 3 +--
 .../python-experimental/petstore_api/model/enum_test.pyi | 3 +--
 .../petstore_api/model/equilateral_triangle.py           | 3 +--
 .../petstore_api/model/equilateral_triangle.pyi          | 3 +--
 .../python-experimental/petstore_api/model/file.py       | 3 +--
 .../python-experimental/petstore_api/model/file.pyi      | 3 +--
 .../petstore_api/model/file_schema_test_class.py         | 3 +--
 .../petstore_api/model/file_schema_test_class.pyi        | 3 +--
 .../python-experimental/petstore_api/model/foo.py        | 3 +--
 .../python-experimental/petstore_api/model/foo.pyi       | 3 +--
 .../petstore_api/model/format_test.py                    | 3 +--
 .../petstore_api/model/format_test.pyi                   | 3 +--
 .../python-experimental/petstore_api/model/fruit.py      | 3 +--
 .../python-experimental/petstore_api/model/fruit.pyi     | 3 +--
 .../python-experimental/petstore_api/model/gm_fruit.py   | 3 +--
 .../python-experimental/petstore_api/model/gm_fruit.pyi  | 3 +--
 .../petstore_api/model/grandparent_animal.py             | 3 +--
 .../petstore_api/model/grandparent_animal.pyi            | 3 +--
 .../petstore_api/model/has_only_read_only.py             | 3 +--
 .../petstore_api/model/has_only_read_only.pyi            | 3 +--
 .../petstore_api/model/health_check_result.py            | 3 +--
 .../petstore_api/model/health_check_result.pyi           | 3 +--
 .../petstore_api/model/isosceles_triangle.py             | 3 +--
 .../petstore_api/model/isosceles_triangle.pyi            | 3 +--
 .../python-experimental/petstore_api/model/map_test.py   | 3 +--
 .../python-experimental/petstore_api/model/map_test.pyi  | 3 +--
 .../mixed_properties_and_additional_properties_class.py  | 3 +--
 .../mixed_properties_and_additional_properties_class.pyi | 3 +--
 .../petstore_api/model/model200_response.py              | 3 +--
 .../petstore_api/model/model200_response.pyi             | 3 +--
 .../petstore_api/model/model_return.py                   | 3 +--
 .../petstore_api/model/model_return.pyi                  | 3 +--
 .../python-experimental/petstore_api/model/money.py      | 3 +--
 .../python-experimental/petstore_api/model/money.pyi     | 3 +--
 .../python-experimental/petstore_api/model/name.py       | 3 +--
 .../python-experimental/petstore_api/model/name.pyi      | 3 +--
 .../petstore_api/model/number_only.py                    | 3 +--
 .../petstore_api/model/number_only.pyi                   | 3 +--
 .../petstore_api/model/object_model_with_ref_props.py    | 3 +--
 .../petstore_api/model/object_model_with_ref_props.pyi   | 3 +--
 .../petstore_api/model/object_with_decimal_properties.py | 3 +--
 .../model/object_with_decimal_properties.pyi             | 3 +--
 .../model/object_with_difficultly_named_props.py         | 3 +--
 .../model/object_with_difficultly_named_props.pyi        | 3 +--
 .../model/object_with_inline_composition_property.py     | 3 +--
 .../model/object_with_inline_composition_property.pyi    | 3 +--
 .../python-experimental/petstore_api/model/order.py      | 3 +--
 .../python-experimental/petstore_api/model/order.pyi     | 3 +--
 .../python-experimental/petstore_api/model/pet.py        | 3 +--
 .../python-experimental/petstore_api/model/pet.pyi       | 3 +--
 .../python-experimental/petstore_api/model/player.py     | 3 +--
 .../python-experimental/petstore_api/model/player.pyi    | 3 +--
 .../petstore_api/model/quadrilateral_interface.py        | 3 +--
 .../petstore_api/model/quadrilateral_interface.pyi       | 3 +--
 .../petstore_api/model/read_only_first.py                | 3 +--
 .../petstore_api/model/read_only_first.pyi               | 3 +--
 .../petstore_api/model/scalene_triangle.py               | 3 +--
 .../petstore_api/model/scalene_triangle.pyi              | 3 +--
 .../petstore_api/model/simple_quadrilateral.py           | 3 +--
 .../petstore_api/model/simple_quadrilateral.pyi          | 3 +--
 .../petstore_api/model/special_model_name.py             | 3 +--
 .../petstore_api/model/special_model_name.pyi            | 3 +--
 .../python-experimental/petstore_api/model/tag.py        | 3 +--
 .../python-experimental/petstore_api/model/tag.pyi       | 3 +--
 .../petstore_api/model/triangle_interface.py             | 3 +--
 .../petstore_api/model/triangle_interface.pyi            | 3 +--
 .../python-experimental/petstore_api/model/user.py       | 3 +--
 .../python-experimental/petstore_api/model/user.pyi      | 3 +--
 .../python-experimental/petstore_api/model/whale.py      | 3 +--
 .../python-experimental/petstore_api/model/whale.pyi     | 3 +--
 .../petstore_api/paths/fake_1/post.py                    | 3 +--
 .../petstore_api/paths/fake_1/post.pyi                   | 3 +--
 .../python-experimental/petstore_api/paths/fake_2/get.py | 3 +--
 .../petstore_api/paths/fake_2/get.pyi                    | 3 +--
 .../petstore_api/paths/fake_inline_composition_/post.py  | 9 +++------
 .../petstore_api/paths/fake_inline_composition_/post.pyi | 9 +++------
 .../petstore_api/paths/fake_json_form_data/get.py        | 3 +--
 .../petstore_api/paths/fake_json_form_data/get.pyi       | 3 +--
 .../petstore_api/paths/fake_obj_in_query/get.py          | 3 +--
 .../petstore_api/paths/fake_obj_in_query/get.pyi         | 3 +--
 .../fake_pet_id_upload_image_with_required_file/post.py  | 3 +--
 .../fake_pet_id_upload_image_with_required_file/post.pyi | 3 +--
 .../petstore_api/paths/fake_upload_file/post.py          | 3 +--
 .../petstore_api/paths/fake_upload_file/post.pyi         | 3 +--
 .../petstore_api/paths/fake_upload_files/post.py         | 3 +--
 .../petstore_api/paths/fake_upload_files/post.pyi        | 3 +--
 .../python-experimental/petstore_api/paths/foo/get.py    | 3 +--
 .../python-experimental/petstore_api/paths/foo/get.pyi   | 3 +--
 .../petstore_api/paths/pet_pet_id_3/post.py              | 3 +--
 .../petstore_api/paths/pet_pet_id_3/post.pyi             | 3 +--
 .../petstore_api/paths/pet_pet_id_upload_image/post.py   | 3 +--
 .../petstore_api/paths/pet_pet_id_upload_image/post.pyi  | 3 +--
 .../petstore/python-experimental/petstore_api/schemas.py | 5 +++--
 133 files changed, 142 insertions(+), 274 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
index 69a2b1c4c7d..f69d2ec7625 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_getitems_without_addprops.handlebars
@@ -40,7 +40,6 @@ def get_item_oapg(self, name: typing.Literal["{{{baseName}}}"]) -> {{#unless req
 def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
 
 def get_item_oapg(self, name: typing.Union[typing.Literal[{{#each vars}}"{{{baseName}}}", {{/each}}], str]):
-    # dict_instance[name] accessor
-    return super().__getitem__(name)
+    return super().get_item_oapg(name)
 
 {{/if}}
\ No newline at end of file
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 7124d5fc78e..8424a352b70 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -1563,7 +1563,7 @@ class DictBase(Discriminable, ValidatorBase):
         if not isinstance(self, FileIO):
             raise AttributeError('property setting not supported on immutable instances')
 
-    def __getattr__(self, name: str) typing.Union['AnyTypeSchema']:
+    def __getattr__(self, name: str) -> 'AnyTypeSchema':
         """
         for instance.name access
         Properties are only type hinted for required properties
@@ -1573,10 +1573,12 @@ class DictBase(Discriminable, ValidatorBase):
             return super().__getattr__(name)
         try:
             value = self[name]
+            return value
+            # TODO if attr is not required then raise AttributeError
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema']:
+    def __getitem__(self, name: str) -> 'AnyTypeSchema':
         """
         dict_instance[name] accessor
         key errors thrown
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index 28b61d96070..a598b707fd8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -273,8 +273,7 @@ class AdditionalPropertiesClass(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index 28b61d96070..a598b707fd8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -273,8 +273,7 @@ class AdditionalPropertiesClass(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["map_property", "map_of_map_property", "anytype_1", "map_with_undeclared_properties_anytype_1", "map_with_undeclared_properties_anytype_2", "map_with_undeclared_properties_anytype_3", "empty_map", "map_with_undeclared_properties_string", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
index f27ca479b90..bdd1c67eb4b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py
@@ -80,8 +80,7 @@ class Animal(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", "color", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
index f27ca479b90..bdd1c67eb4b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.pyi
@@ -80,8 +80,7 @@ class Animal(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", "color", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 0cc3b30d1d9..89c6db20e05 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -74,8 +74,7 @@ class ApiResponse(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 0cc3b30d1d9..89c6db20e05 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -74,8 +74,7 @@ class ApiResponse(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["code", "type", "message", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 99cc2870892..52550c96514 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
@@ -98,8 +98,7 @@ class Apple(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
index f01281dce77..cb83f541ba5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.pyi
@@ -85,8 +85,7 @@ class Apple(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["cultivar", "origin", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 e7a49bd8d9d..e58148d2c65 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
@@ -102,8 +102,7 @@ class ArrayOfArrayOfNumberOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index e7a49bd8d9d..e58148d2c65 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -102,8 +102,7 @@ class ArrayOfArrayOfNumberOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayArrayNumber", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 ce257d4fb7a..7d37cf39a39 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
@@ -80,8 +80,7 @@ class ArrayOfNumberOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index ce257d4fb7a..7d37cf39a39 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -80,8 +80,7 @@ class ArrayOfNumberOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["ArrayNumber", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 d4c53bcabfc..9b59a1ed8ac 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
@@ -188,8 +188,7 @@ class ArrayTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index d4c53bcabfc..9b59a1ed8ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -188,8 +188,7 @@ class ArrayTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["array_of_string", "array_array_of_integer", "array_array_of_model", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
index b049e0d5e70..f037cbfa626 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py
@@ -62,8 +62,7 @@ class Banana(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
index b049e0d5e70..f037cbfa626 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.pyi
@@ -62,8 +62,7 @@ class Banana(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["lengthCm", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
index 849509d2a52..12ff5eaa70d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py
@@ -76,8 +76,7 @@ class BasquePig(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
index 849509d2a52..12ff5eaa70d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.pyi
@@ -76,8 +76,7 @@ class BasquePig(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index 96b6e28ed19..ada8c015951 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -98,8 +98,7 @@ class Capitalization(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index 96b6e28ed19..ada8c015951 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -98,8 +98,7 @@ class Capitalization(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["smallCamel", "CapitalCamel", "small_Snake", "Capital_Snake", "SCA_ETH_Flow_Points", "ATT_NAME", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 fa3da4c3b3d..dcfaed1e359 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
@@ -66,8 +66,7 @@ class Cat(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["declawed", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index fa3da4c3b3d..dcfaed1e359 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -66,8 +66,7 @@ class Cat(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["declawed", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
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 d4472046c9f..d0bafdef461 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
@@ -70,8 +70,7 @@ class Category(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "id", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
index d4472046c9f..d0bafdef461 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.pyi
@@ -70,8 +70,7 @@ class Category(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "id", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 44d5bb9ee07..055e3ccd010 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
@@ -66,8 +66,7 @@ class ChildCat(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["name", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 44d5bb9ee07..055e3ccd010 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -66,8 +66,7 @@ class ChildCat(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["name", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
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 f2029293ba5..d5a0789ca33 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
@@ -61,8 +61,7 @@ class ClassModel(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["_class", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index f2029293ba5..d5a0789ca33 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -61,8 +61,7 @@ class ClassModel(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["_class", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index 9999861d505..fcadba541d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -58,8 +58,7 @@ class Client(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["client", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index 9999861d505..fcadba541d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -58,8 +58,7 @@ class Client(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["client", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 21f5738bedf..15537e23a5d 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
@@ -80,8 +80,7 @@ class ComplexQuadrilateral(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 21f5738bedf..15537e23a5d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -80,8 +80,7 @@ class ComplexQuadrilateral(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
index 9e43ce663cb..68fa3ec874b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py
@@ -76,8 +76,7 @@ class DanishPig(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
index 9e43ce663cb..68fa3ec874b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.pyi
@@ -76,8 +76,7 @@ class DanishPig(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 4e06aff1388..cb51e24be1c 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
@@ -66,8 +66,7 @@ class Dog(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["breed", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index 4e06aff1388..cb51e24be1c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -66,8 +66,7 @@ class Dog(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["breed", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
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 550c48d66ce..187722f2c7a 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
@@ -128,8 +128,7 @@ class EnumArrays(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 550c48d66ce..187722f2c7a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -128,8 +128,7 @@ class EnumArrays(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["just_symbol", "array_enum", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 dd88bcc586b..4c7ab6736db 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
@@ -238,8 +238,7 @@ class EnumTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
index dd88bcc586b..4c7ab6736db 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.pyi
@@ -238,8 +238,7 @@ class EnumTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["enum_string_required", "enum_string", "enum_integer", "enum_number", "stringEnum", "IntegerEnum", "StringEnumWithDefaultValue", "IntegerEnumWithDefaultValue", "IntegerEnumOneValue", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 35f2a4d59d2..4f7e13b4907 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
@@ -80,8 +80,7 @@ class EquilateralTriangle(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index 35f2a4d59d2..4f7e13b4907 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -80,8 +80,7 @@ class EquilateralTriangle(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index b3a97f97884..6e31b4cf812 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -60,8 +60,7 @@ class File(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index b3a97f97884..6e31b4cf812 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -60,8 +60,7 @@ class File(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["sourceURI", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 15289da69ea..83895979a71 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
@@ -96,8 +96,7 @@ class FileSchemaTestClass(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["file", "files", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 15289da69ea..83895979a71 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -96,8 +96,7 @@ class FileSchemaTestClass(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["file", "files", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index 0146852bbb5..11c888cda77 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -58,8 +58,7 @@ class Foo(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index 0146852bbb5..11c888cda77 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -58,8 +58,7 @@ class Foo(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 e193ad50ef5..303e3365a99 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
@@ -343,8 +343,7 @@ class FormatTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
index a0cc0de9575..f3dc5f359e0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.pyi
@@ -295,8 +295,7 @@ class FormatTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["number", "byte", "date", "password", "integer", "int32", "int32withValidations", "int64", "float", "float32", "double", "float64", "arrayWithUniqueItems", "string", "binary", "dateTime", "uuid", "uuidNoExample", "pattern_with_digits", "pattern_with_digits_and_delimiter", "noneProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 19f929c7e17..8e013ddfe11 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
@@ -75,8 +75,7 @@ class Fruit(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 19f929c7e17..8e013ddfe11 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -75,8 +75,7 @@ class Fruit(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 19410a47efb..becd6db7a96 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
@@ -75,8 +75,7 @@ class GmFruit(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index 19410a47efb..becd6db7a96 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -75,8 +75,7 @@ class GmFruit(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["color", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
index e46b48a9e44..09b26581c2f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py
@@ -72,8 +72,7 @@ class GrandparentAnimal(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["pet_type", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
index e46b48a9e44..09b26581c2f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.pyi
@@ -72,8 +72,7 @@ class GrandparentAnimal(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["pet_type", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index 86adf681ee2..f1c5d6fe385 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -66,8 +66,7 @@ class HasOnlyReadOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index 86adf681ee2..f1c5d6fe385 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -66,8 +66,7 @@ class HasOnlyReadOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 0901ef53918..9f8efa019e6 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
@@ -80,8 +80,7 @@ class HealthCheckResult(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 0901ef53918..9f8efa019e6 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -80,8 +80,7 @@ class HealthCheckResult(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["NullableMessage", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 247161f73d4..0e93639c95f 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
@@ -80,8 +80,7 @@ class IsoscelesTriangle(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index 247161f73d4..0e93639c95f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -80,8 +80,7 @@ class IsoscelesTriangle(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index e91a7435ec7..fd72b091f0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -218,8 +218,7 @@ class MapTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index e91a7435ec7..fd72b091f0a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -218,8 +218,7 @@ class MapTest(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["map_map_of_string", "map_of_enum_string", "direct_map", "indirect_map", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index c94c390ad0c..c5300cc0ec2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -106,8 +106,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index c94c390ad0c..c5300cc0ec2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -106,8 +106,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["uuid", "dateTime", "map", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 c2c9d89c428..d201b3b87b9 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
@@ -69,8 +69,7 @@ class Model200Response(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "class", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index c2c9d89c428..d201b3b87b9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -69,8 +69,7 @@ class Model200Response(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "class", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 7c0c0720b45..12442ba49f2 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
@@ -61,8 +61,7 @@ class ModelReturn(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["return", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index 7c0c0720b45..12442ba49f2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -61,8 +61,7 @@ class ModelReturn(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["return", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
index 88174c369e8..d3ccce31802 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py
@@ -76,8 +76,7 @@ class Money(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
index 88174c369e8..d3ccce31802 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.pyi
@@ -76,8 +76,7 @@ class Money(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["amount", "currency", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     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 882051e0254..b0ffbc41088 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
@@ -81,8 +81,7 @@ class Name(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
index 882051e0254..b0ffbc41088 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.pyi
@@ -81,8 +81,7 @@ class Name(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "snake_case", "property", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 18552d50a92..6cb40db86c8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -58,8 +58,7 @@ class NumberOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 18552d50a92..6cb40db86c8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -58,8 +58,7 @@ class NumberOnly(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["JustNumber", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index 5b913e718ac..53499f7ca02 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -80,8 +80,7 @@ class ObjectModelWithRefProps(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index 5b913e718ac..53499f7ca02 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -80,8 +80,7 @@ class ObjectModelWithRefProps(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["myNumber", "myString", "myBoolean", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index 951e29818bd..559a9082ac4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -78,8 +78,7 @@ class ObjectWithDecimalProperties(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index 951e29818bd..559a9082ac4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -78,8 +78,7 @@ class ObjectWithDecimalProperties(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["length", "width", "cost", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
index a2c526f97d3..0eed71b7a97 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py
@@ -79,8 +79,7 @@ class ObjectWithDifficultlyNamedProps(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
index a2c526f97d3..0eed71b7a97 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.pyi
@@ -79,8 +79,7 @@ class ObjectWithDifficultlyNamedProps(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["123-list", "$special[property.name]", "123Number", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 48079bb3b7e..0fda845866d 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
@@ -103,8 +103,7 @@ class ObjectWithInlineCompositionProperty(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index b6e5f3fde22..0140709810a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -100,8 +100,7 @@ class ObjectWithInlineCompositionProperty(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index 313cdc78dd6..733177b3930 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -124,8 +124,7 @@ class Order(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index 313cdc78dd6..733177b3930 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -124,8 +124,7 @@ class Order(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["id", "petId", "quantity", "shipDate", "status", "complete", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 06b9e159599..c1262a49e4b 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
@@ -184,8 +184,7 @@ class Pet(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
index 06b9e159599..c1262a49e4b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.pyi
@@ -184,8 +184,7 @@ class Pet(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "photoUrls", "id", "category", "tags", "status", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index 2faee99c856..f5d402d0d65 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -72,8 +72,7 @@ class Player(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index 2faee99c856..f5d402d0d65 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -72,8 +72,7 @@ class Player(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "enemyPlayer", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 5d184afa646..37ab31e155d 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
@@ -87,8 +87,7 @@ class QuadrilateralInterface(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
index 5d184afa646..37ab31e155d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.pyi
@@ -87,8 +87,7 @@ class QuadrilateralInterface(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "quadrilateralType", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index f018cc01874..b588fa0cfbf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -66,8 +66,7 @@ class ReadOnlyFirst(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index f018cc01874..b588fa0cfbf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -66,8 +66,7 @@ class ReadOnlyFirst(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "baz", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 3cf568d5100..fd873ceae33 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
@@ -80,8 +80,7 @@ class ScaleneTriangle(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index 3cf568d5100..fd873ceae33 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -80,8 +80,7 @@ class ScaleneTriangle(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["triangleType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
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 0c27353530d..b804656b591 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
@@ -80,8 +80,7 @@ class SimpleQuadrilateral(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index 0c27353530d..b804656b591 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -80,8 +80,7 @@ class SimpleQuadrilateral(
             def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
             
             def get_item_oapg(self, name: typing.Union[typing.Literal["quadrilateralType", ], str]):
-                # dict_instance[name] accessor
-                return super().__getitem__(name)
+                return super().get_item_oapg(name)
             
         
             def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index a5dddd05fe2..3d25ed32596 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -60,8 +60,7 @@ class SpecialModelName(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index a5dddd05fe2..3d25ed32596 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -60,8 +60,7 @@ class SpecialModelName(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index c7f6228f11d..b676eda9bbf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -66,8 +66,7 @@ class Tag(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["id", "name", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index c7f6228f11d..b676eda9bbf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -66,8 +66,7 @@ class Tag(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["id", "name", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 d1484a6efd3..04a5ac2a9cd 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
@@ -87,8 +87,7 @@ class TriangleInterface(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
index d1484a6efd3..04a5ac2a9cd 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.pyi
@@ -87,8 +87,7 @@ class TriangleInterface(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["shapeType", "triangleType", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 54bd17c4ae3..a737521628f 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
@@ -198,8 +198,7 @@ class User(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index 54bd17c4ae3..a737521628f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -198,8 +198,7 @@ class User(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus", "objectWithNoDeclaredProps", "objectWithNoDeclaredPropsNullable", "anyTypeProp", "anyTypeExceptNullProp", "anyTypePropNullable", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 5e389d69f24..0c8aa483d84 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
@@ -92,8 +92,7 @@ class Whale(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
index 5e389d69f24..0c8aa483d84 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.pyi
@@ -92,8 +92,7 @@ class Whale(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["className", "hasBaleen", "hasTeeth", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 6709434a7d5..f2a4b93a9bc 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
@@ -249,8 +249,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
index 47f55c63856..296b30e06ac 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_1/post.pyi
@@ -211,8 +211,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["integer", "int32", "int64", "number", "float", "double", "string", "pattern_without_delimiter", "byte", "binary", "date", "dateTime", "password", "callback", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 35389b4b27d..48f748298a4 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
@@ -393,8 +393,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 39db2f18454..6c324afc1a1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -317,8 +317,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["enum_form_string_array", "enum_form_string", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 9e26b7bcfae..bffc3bf8303 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
@@ -150,8 +150,7 @@ class CompositionInPropertySchema(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
@@ -324,8 +323,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
@@ -476,8 +474,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index c7498d841e7..3b1585e9be8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -142,8 +142,7 @@ class CompositionInPropertySchema(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
@@ -279,8 +278,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
@@ -415,8 +413,7 @@ class SchemaFor200ResponseBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["someProp", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
index f546e7d9115..ef20cd91710 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.py
@@ -73,8 +73,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
index c668488d279..606ef538971 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_json_form_data/get.pyi
@@ -71,8 +71,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["param", "param2", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index b8c4cdee99c..9a6b21202c5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -58,8 +58,7 @@ class MapBeanSchema(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["keyword", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index 5b1e8eaef5b..d879e557de1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -56,8 +56,7 @@ class MapBeanSchema(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["keyword", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 ebc4a941f59..a471b411871 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
@@ -99,8 +99,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
index e72ac18ed4b..9c243ae080b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post.pyi
@@ -73,8 +73,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "requiredFile", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 f415b8308c2..01e39f9115a 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
@@ -73,8 +73,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
index 952de2a085f..337f6ee254b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_file/post.pyi
@@ -71,8 +71,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 55ce2d36417..ba7a764800b 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
@@ -83,8 +83,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["files", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 84d4adb07fc..50a99f79da7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -81,8 +81,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["files", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index 321980d83bf..1890f090a86 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -64,8 +64,7 @@ class SchemaFor0ResponseBodyApplicationJson(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["string", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index 63a0fb82c5b..67faf18db5c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -62,8 +62,7 @@ class SchemaFor0ResponseBodyApplicationJson(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["string", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index abdd85044e1..7206838b29a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -93,8 +93,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "status", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index 93362ca4fe7..fc89ca3aa27 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -67,8 +67,7 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["name", "status", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index c01bfbf6c2c..7311adffdc1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -95,8 +95,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 45757f6148c..65108fac2a4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -69,8 +69,7 @@ class SchemaForRequestBodyMultipartFormData(
     def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
     
     def get_item_oapg(self, name: typing.Union[typing.Literal["additionalMetadata", "file", ], str]):
-        # dict_instance[name] accessor
-        return super().__getitem__(name)
+        return super().get_item_oapg(name)
     
 
     def __new__(
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 91489367844..ce8a1276933 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -1570,7 +1570,7 @@ class DictBase(Discriminable, ValidatorBase):
         if not isinstance(self, FileIO):
             raise AttributeError('property setting not supported on immutable instances')
 
-    def __getattr__(self, name: str) typing.Union['AnyTypeSchema']:
+    def __getattr__(self, name: str) -> 'AnyTypeSchema':
         """
         for instance.name access
         Properties are only type hinted for required properties
@@ -1580,10 +1580,11 @@ class DictBase(Discriminable, ValidatorBase):
             return super().__getattr__(name)
         try:
             value = self[name]
+            return value
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def __getitem__(self, name: str) -> typing.Union['AnyTypeSchema']:
+    def __getitem__(self, name: str) -> 'AnyTypeSchema':
         """
         dict_instance[name] accessor
         key errors thrown
-- 
GitLab


From 3676cb2a25e3a507d09f527850f2f5b4d5a655d9 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 18:01:24 -0700
Subject: [PATCH 18/30] Fixes tests

---
 .../python-experimental/schemas.handlebars    |  4 ++--
 .../petstore_api/schemas.py                   |  5 +++--
 .../test_additional_properties_class.py       | 11 ++++++----
 .../tests_manual/test_deserialization.py      |  5 +++--
 .../tests_manual/test_fruit.py                |  4 +++-
 .../tests_manual/test_fruit_req.py            | 10 +++++++---
 .../tests_manual/test_gm_fruit.py             | 20 +++++++++++--------
 .../test_no_additional_properties.py          |  7 +++++--
 8 files changed, 42 insertions(+), 24 deletions(-)

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 8424a352b70..c6bfc2f1f0b 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -1563,7 +1563,7 @@ class DictBase(Discriminable, ValidatorBase):
         if not isinstance(self, FileIO):
             raise AttributeError('property setting not supported on immutable instances')
 
-    def __getattr__(self, name: str) -> 'AnyTypeSchema':
+    def __getattr__(self, name: str):
         """
         for instance.name access
         Properties are only type hinted for required properties
@@ -1578,7 +1578,7 @@ class DictBase(Discriminable, ValidatorBase):
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def __getitem__(self, name: str) -> 'AnyTypeSchema':
+    def __getitem__(self, name: str):
         """
         dict_instance[name] accessor
         key errors thrown
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 ce8a1276933..46b0413b51f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -1570,7 +1570,7 @@ class DictBase(Discriminable, ValidatorBase):
         if not isinstance(self, FileIO):
             raise AttributeError('property setting not supported on immutable instances')
 
-    def __getattr__(self, name: str) -> 'AnyTypeSchema':
+    def __getattr__(self, name: str):
         """
         for instance.name access
         Properties are only type hinted for required properties
@@ -1581,10 +1581,11 @@ class DictBase(Discriminable, ValidatorBase):
         try:
             value = self[name]
             return value
+            # TODO if attr is not required then raise AttributeError
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def __getitem__(self, name: str) -> 'AnyTypeSchema':
+    def __getitem__(self, name: str):
         """
         dict_instance[name] accessor
         key errors thrown
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py
index 3e0bc9ae713..b0142bd4adb 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py
@@ -20,13 +20,16 @@ class TestAdditionalPropertiesClass(unittest.TestCase):
 
     def test_additional_properties_class(self):
         inst = AdditionalPropertiesClass({})
-        map_property_by_getitem = inst["map_property"]
-        assert map_property_by_getitem is schemas.unset
-        map_property_by_attribute = inst.map_property
-        assert map_property_by_attribute is schemas.unset
+        with self.assertRaises(KeyError):
+            inst["map_property"]
+        assert inst.get_item_oapg("map_property") is schemas.unset
+        with self.assertRaises(AttributeError):
+            inst.map_property
 
         inst = AdditionalPropertiesClass(map_property={})
         assert inst.map_property == {}
+        map_property = inst["map_property"]
+        assert map_property == {}
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py
index fc525c19b56..492a0e4f44b 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py
@@ -308,8 +308,9 @@ class DeserializationTests(unittest.TestCase):
             },
         )
         with self.assertRaisesRegex(
-            petstore_api.exceptions.ApiTypeError,
-            r"BananaReq was passed 1 invalid argument: \['unknown-group'\]"
+            petstore_api.exceptions.ApiValueError,
+            r"Invalid value 'abc' was passed in to NotAnyTypeSchema. "
+            r"Value is invalid because it is disallowed by AnyTypeSchema"
         ):
             data = {
                 'lengthCm': 21.2,
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
index 44d6fa701bc..0a7abfba25f 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
@@ -51,7 +51,9 @@ class TestFruit(unittest.TestCase):
 
         # getting a value that doesn't exist raises an exception
         # with a key
-        assert fruit['cultivar'] is schemas.unset
+        with self.assertRaises(KeyError):
+            assert fruit['cultivar']
+        assert fruit.get_item_oapg('cultivar') is schemas.unset
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
index 55c1d761ed6..2564a57111f 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit_req.py
@@ -56,13 +56,17 @@ class TestFruitReq(unittest.TestCase):
 
         # getting a value that doesn't exist raises an exception
         # with a key
-        cultivar_value = fruit['cultivar']
-        assert cultivar_value is schemas.unset
+        with self.assertRaises(KeyError):
+            fruit['cultivar']
+        with self.assertRaises(AttributeError):
+            fruit.cultivar
+        assert fruit.get_item_oapg('cultivar') is schemas.unset
 
         # with getattr
         self.assertEqual(getattr(fruit, 'cultivar', 'some value'), 'some value')
 
-        assert getattr(fruit, 'cultivar') is schemas.unset
+        with self.assertRaises(AttributeError):
+            getattr(fruit, 'cultivar')
 
         # make sure that the ModelComposed class properties are correct
         self.assertEqual(
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
index 46b80ef59f4..9ed73158a45 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
@@ -59,13 +59,16 @@ class TestGmFruit(unittest.TestCase):
             }
         )
 
-        # known variable from Apple is unset if it is not in the payload
-        fruit_origin_by_get_item = fruit["origin"]
-        assert fruit_origin_by_get_item is schemas.unset
-        assert fruit.origin is schemas.unset
-
-        unknown_variable = fruit['unknown_variable']
-        assert unknown_variable is schemas.unset
+        # unset key access raises KeyError
+        with self.assertRaises(KeyError):
+            fruit["origin"]
+        with self.assertRaises(AttributeError):
+            fruit.origin
+        assert fruit.get_item_oapg("origin") is schemas.unset
+
+        with self.assertRaises(KeyError):
+            fruit['unknown_variable']
+        assert fruit.get_item_oapg("unknown_variable") is schemas.unset
         # with getattr
         self.assertTrue(getattr(fruit, 'origin', 'some value'), 'some value')
 
@@ -79,7 +82,7 @@ class TestGmFruit(unittest.TestCase):
         )
 
         # including extra parameters works
-        fruit = GmFruit(
+        GmFruit(
             color=color,
             length_cm=length_cm,
             cultivar=cultivar,
@@ -131,5 +134,6 @@ class TestGmFruit(unittest.TestCase):
             }
         )
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_no_additional_properties.py
index 446dcee97c7..723f32201bd 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_no_additional_properties.py
@@ -35,8 +35,11 @@ class TestNoAdditionalProperties(unittest.TestCase):
         id_by_property = inst.id
         assert id_by_property == 1
         assert isinstance(id_by_property, (schemas.Int64Schema, decimal.Decimal))
-        assert inst.petId is schemas.unset
-        assert inst["petId"] is schemas.unset
+        with self.assertRaises(AttributeError):
+            inst.petId
+        with self.assertRaises(KeyError):
+            inst["petId"]
+        assert inst.get_item_oapg("petId") is schemas.unset
 
         # works with required + optional
         inst = NoAdditionalProperties(id=1, petId=2)
-- 
GitLab


From 82ab6c41e412f9ca376dfc5aee7737f44d71f939 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 18:07:45 -0700
Subject: [PATCH 19/30] Raises AttributeError if a property is not required and
 it is dotname accessed

---
 .../src/main/resources/python-experimental/schemas.handlebars  | 3 ++-
 .../petstore/python-experimental/petstore_api/schemas.py       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 c6bfc2f1f0b..965ef89a80b 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -1571,10 +1571,11 @@ class DictBase(Discriminable, ValidatorBase):
         """
         if not isinstance(self, frozendict.frozendict):
             return super().__getattr__(name)
+        if name not in self.__class__.__annotations__:
+            raise AttributeError(f"{self} has no attribute '{name}'")
         try:
             value = self[name]
             return value
-            # TODO if attr is not required then raise AttributeError
         except KeyError as ex:
             raise AttributeError(str(ex))
 
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 46b0413b51f..b637c0cb2d0 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -1578,10 +1578,11 @@ class DictBase(Discriminable, ValidatorBase):
         """
         if not isinstance(self, frozendict.frozendict):
             return super().__getattr__(name)
+        if name not in self.__class__.__annotations__:
+            raise AttributeError(f"{self} has no attribute '{name}'")
         try:
             value = self[name]
             return value
-            # TODO if attr is not required then raise AttributeError
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-- 
GitLab


From 9340c19fdc816b2fbb15a7492b43dc92e6461c4a Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 18:18:13 -0700
Subject: [PATCH 20/30] Fixes one test

---
 .../tests_manual/test_animal.py               | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py
index 57dece3c8be..f67158bca1c 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_animal.py
@@ -41,14 +41,14 @@ class TestAnimal(unittest.TestCase):
             Animal(className='Fox', color='red')
 
         animal = Animal(className='Cat', color='black')
-        assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Cat)
         assert isinstance(animal, Cat.MetaOapg.all_of[1])
+        assert isinstance(animal, Animal)
         assert set(animal.keys()) == {'className', 'color'}
         assert animal.className == 'Cat'
-        assert animal.color == 'black'
-        assert isinstance(animal.color, StrSchema)
+        assert animal["color"] == 'black'
+        assert isinstance(animal["color"], StrSchema)
         assert isinstance(animal.className, StrSchema)
 
         # pass in optional param
@@ -59,31 +59,37 @@ class TestAnimal(unittest.TestCase):
         assert isinstance(animal, Cat.MetaOapg.all_of[1])
         assert set(animal.keys()) == {'className', 'color', 'declawed'}
         assert animal.className == 'Cat'
-        assert animal.color == 'black'
-        assert bool(animal.declawed) is True
-        assert isinstance(animal.color, StrSchema)
+        assert animal["color"] == 'black'
+        assert bool(animal["declawed"]) is True
+        assert isinstance(animal["color"], StrSchema)
         assert isinstance(animal.className, StrSchema)
-        assert isinstance(animal.declawed, BoolSchema)
+        assert isinstance(animal["declawed"], BoolSchema)
 
         # make a Dog
         animal = Animal(className='Dog', color='black')
-        assert isinstance(animal, (Animal, frozendict.frozendict, Dog, Dog.MetaOapg.all_of[1]))
+        assert isinstance(animal, Animal)
+        assert isinstance(animal, frozendict.frozendict)
+        assert isinstance(animal, Dog)
+        assert isinstance(animal, Dog.MetaOapg.all_of[1])
         assert set(animal.keys()) == {'className', 'color'}
         assert animal.className == 'Dog'
-        assert animal.color == 'black'
-        assert isinstance(animal.color, StrSchema)
+        assert animal["color"] == 'black'
+        assert isinstance(animal["color"], StrSchema)
         assert isinstance(animal.className, StrSchema)
 
         # pass in optional param
         animal = Animal(className='Dog', color='black', breed='Labrador')
-        assert isinstance(animal, (Animal, frozendict.frozendict, Dog, Dog.MetaOapg.all_of[1]))
+        assert isinstance(animal, Animal)
+        assert isinstance(animal, frozendict.frozendict)
+        assert isinstance(animal, Dog)
+        assert isinstance(animal, Dog.MetaOapg.all_of[1])
         assert set(animal.keys()) == {'className', 'color', 'breed'}
         assert animal.className == 'Dog'
-        assert animal.color == 'black'
-        assert animal.breed == 'Labrador'
-        assert isinstance(animal.color, StrSchema)
+        assert animal["color"] == 'black'
+        assert animal["breed"] == 'Labrador'
         assert isinstance(animal.className, StrSchema)
-        assert isinstance(animal.breed, StrSchema)
+        assert isinstance(animal["color"], StrSchema)
+        assert isinstance(animal["breed"], StrSchema)
 
 
 if __name__ == '__main__':
-- 
GitLab


From 9da6b920a1a5781af37f7c175b5a050a73cc1b6c Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 23:27:52 -0700
Subject: [PATCH 21/30] Fixes 3 tests

---
 .../tests_manual/test_drawing.py              | 27 ++++++++++---------
 .../tests_manual/test_whale.py                |  8 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py
index ba919798147..11a4640f6af 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py
@@ -76,13 +76,13 @@ class TestDrawing(unittest.TestCase):
             ],
         )
         assert isinstance(inst, Drawing)
-        assert isinstance(inst.mainShape, IsoscelesTriangle)
-        self.assertEqual(len(inst.shapes), 4)
+        assert isinstance(inst["mainShape"], IsoscelesTriangle)
+        self.assertEqual(len(inst["shapes"]), 4)
         from petstore_api.model.complex_quadrilateral import ComplexQuadrilateral
-        assert isinstance(inst.shapes[0], EquilateralTriangle)
-        assert isinstance(inst.shapes[1], IsoscelesTriangle)
-        assert isinstance(inst.shapes[2], EquilateralTriangle)
-        assert isinstance(inst.shapes[3], ComplexQuadrilateral)
+        assert isinstance(inst["shapes"][0], EquilateralTriangle)
+        assert isinstance(inst["shapes"][1], IsoscelesTriangle)
+        assert isinstance(inst["shapes"][2], EquilateralTriangle)
+        assert isinstance(inst["shapes"][3], ComplexQuadrilateral)
 
         # Validate we cannot assign the None value to mainShape because the 'null' type
         # is not one of the allowed types in the 'Shape' schema.
@@ -92,7 +92,7 @@ class TestDrawing(unittest.TestCase):
                 petstore_api.ApiValueError,
                 err_msg
         ):
-            inst = Drawing(
+            Drawing(
                 # 'mainShape' has type 'Shape', which is a oneOf [triangle, quadrilateral]
                 # So the None value should not be allowed and an exception should be raised.
                 mainShape=None,
@@ -113,12 +113,13 @@ class TestDrawing(unittest.TestCase):
                 )
             ]
         )
-        self.assertEqual(len(inst.shapes), 1)
+        self.assertEqual(len(inst["shapes"]), 1)
         from petstore_api.model.triangle_interface import TriangleInterface
-        assert isinstance(inst.shapes[0], shape.Shape)
-        assert isinstance(inst.shapes[0], Triangle)
-        assert isinstance(inst.shapes[0], EquilateralTriangle)
-        assert isinstance(inst.shapes[0], TriangleInterface)
+        shapes = inst["shapes"]
+        assert isinstance(inst["shapes"][0], shape.Shape)
+        assert isinstance(inst["shapes"][0], Triangle)
+        assert isinstance(inst["shapes"][0], EquilateralTriangle)
+        assert isinstance(inst["shapes"][0], TriangleInterface)
 
     def test_deserialize_oneof_reference_with_null_type(self):
         """
@@ -137,7 +138,7 @@ class TestDrawing(unittest.TestCase):
         assert isinstance(inst, Drawing)
         self.assertFalse('mainShape' in inst)
         self.assertTrue('shapeOrNull' in inst)
-        self.assertTrue(isinstance(inst.shapeOrNull, NoneClass))
+        self.assertTrue(isinstance(inst["shapeOrNull"], NoneClass))
 
     def test_deserialize_oneof_reference_with_nullable_type(self):
         """
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_whale.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_whale.py
index 88bd8ed12d4..7ce302faf99 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_whale.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_whale.py
@@ -33,16 +33,16 @@ class TestWhale(unittest.TestCase):
             className='whale',
             hasBaleen=True
         )
-        assert isinstance(whale.hasBaleen, BoolClass)
-        self.assertTrue(whale.hasBaleen)
+        assert isinstance(whale["hasBaleen"], BoolClass)
+        self.assertTrue(whale["hasBaleen"])
 
         # test that the hasBaleen __bool__ method is working, False input
         whale = Whale(
             className='whale',
             hasBaleen=False
         )
-        assert isinstance(whale.hasBaleen, BoolClass)
-        self.assertFalse(whale.hasBaleen)
+        assert isinstance(whale["hasBaleen"], BoolClass)
+        self.assertFalse(whale["hasBaleen"])
 
 
 if __name__ == '__main__':
-- 
GitLab


From d11080f91b38f819175df0896207f4af1e15aaf6 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 23:33:51 -0700
Subject: [PATCH 22/30] Fixes test

---
 .../tests_manual/test_format_test.py          | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_format_test.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_format_test.py
index ae4e47cb70f..960d0957517 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_format_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_format_test.py
@@ -50,66 +50,66 @@ class TestFormatTest(unittest.TestCase):
         valid_values = [-2147483648, 2147483647]
         for valid_value in valid_values:
             model = FormatTest(int32=valid_value, **required_args)
-            assert model.int32 == valid_value
+            assert model["int32"] == valid_value
 
         # int64
         # under min
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(int64=-9223372036854775809, **required_args)
+            FormatTest(int64=-9223372036854775809, **required_args)
         # over max
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(int64=9223372036854775808, **required_args)
+            FormatTest(int64=9223372036854775808, **required_args)
         # valid values in range work
         valid_values = [-9223372036854775808, 9223372036854775807]
         for valid_value in valid_values:
             model = FormatTest(int64=valid_value, **required_args)
-            assert model.int64 == valid_value
+            assert model["int64"] == valid_value
 
         # float32
         # under min
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(float32=-3.402823466385289e+38, **required_args)
+            FormatTest(float32=-3.402823466385289e+38, **required_args)
         # over max
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(float32=3.402823466385289e+38, **required_args)
+            FormatTest(float32=3.402823466385289e+38, **required_args)
         # valid values in range work
         valid_values = [-3.4028234663852886e+38, 3.4028234663852886e+38]
         for valid_value in valid_values:
             model = FormatTest(float32=valid_value, **required_args)
-            assert model.float32 == valid_value
+            assert model["float32"] == valid_value
 
         # float64
         # under min, Decimal is used because flat can only store 64bit numbers and the max and min
         # take up more space than 64bit
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(float64=Decimal('-1.7976931348623157082e+308'), **required_args)
+            FormatTest(float64=Decimal('-1.7976931348623157082e+308'), **required_args)
         # over max
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(float64=Decimal('1.7976931348623157082e+308'), **required_args)
+            FormatTest(float64=Decimal('1.7976931348623157082e+308'), **required_args)
         valid_values = [-1.7976931348623157E+308, 1.7976931348623157E+308]
         for valid_value in valid_values:
             model = FormatTest(float64=valid_value, **required_args)
-            assert model.float64 == valid_value
+            assert model["float64"] == valid_value
 
         # unique_items with duplicates throws exception
         with self.assertRaises(petstore_api.ApiValueError):
-            model = FormatTest(arrayWithUniqueItems=[0, 1, 1], **required_args)
+            FormatTest(arrayWithUniqueItems=[0, 1, 1], **required_args)
         # no duplicates works
         values = [0, 1, 2]
         model = FormatTest(arrayWithUniqueItems=values, **required_args)
-        assert model.arrayWithUniqueItems == tuple(values)
+        assert model["arrayWithUniqueItems"] == tuple(values)
 
         # __bool__ value of noneProp is False
         model = FormatTest(noneProp=None, **required_args)
-        assert isinstance(model.noneProp, Singleton)
-        self.assertFalse(model.noneProp)
-        self.assertTrue(model.noneProp.is_none_oapg())
+        assert isinstance(model["noneProp"], Singleton)
+        self.assertFalse(model["noneProp"])
+        self.assertTrue(model["noneProp"].is_none_oapg())
 
         # binary check
         model = FormatTest(binary=b'123', **required_args)
-        assert isinstance(model.binary, BinarySchema)
-        assert isinstance(model.binary, BytesSchema)
-        assert isinstance(model.binary, bytes)
+        assert isinstance(model["binary"], BinarySchema)
+        assert isinstance(model["binary"], BytesSchema)
+        assert isinstance(model["binary"], bytes)
         assert model == frozendict.frozendict(
             binary=b'123',
             number=Decimal(32.5),
@@ -123,7 +123,7 @@ class TestFormatTest(unittest.TestCase):
             petstore_api.exceptions.ApiValueError,
             r"Invalid value `31`, value must be a multiple of `2` at \('args\[0\]', 'integer'\)"
         ):
-            inst = FormatTest(
+            FormatTest(
                 byte='3',
                 date=datetime.date(2000, 1, 1),
                 password="abcdefghijkl",
@@ -132,5 +132,6 @@ class TestFormatTest(unittest.TestCase):
                 float=62.4
             )
 
+
 if __name__ == '__main__':
     unittest.main()
-- 
GitLab


From ef8b7424ac5dc3117f81e2758ba06da134e57ac5 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sat, 3 Sep 2022 23:38:47 -0700
Subject: [PATCH 23/30] Fixes two more tests

---
 .../tests_manual/test_additional_properties_class.py            | 1 -
 .../petstore/python-experimental/tests_manual/test_fake_api.py  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py
index b0142bd4adb..589beb05cde 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_additional_properties_class.py
@@ -27,7 +27,6 @@ class TestAdditionalPropertiesClass(unittest.TestCase):
             inst.map_property
 
         inst = AdditionalPropertiesClass(map_property={})
-        assert inst.map_property == {}
         map_property = inst["map_property"]
         assert map_property == {}
 
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fake_api.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fake_api.py
index 92a5f45ac89..6ef7d1f990b 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fake_api.py
@@ -628,7 +628,7 @@ class TestFakeApi(ApiTestMixin):
            ),
        )
        self.assertEqual(api_response.body, {'someProp': single_char_str})
-       self.assertTrue(isinstance(api_response.body.someProp, schemas.StrSchema))
+       self.assertTrue(isinstance(api_response.body["someProp"], schemas.StrSchema))
 
        # error thrown when a str is input which doesn't meet the composed schema length constraint
        invalid_value = ''
-- 
GitLab


From e998b3de09c371f7f6a93a7c50a9a6123803e406 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 08:42:31 -0700
Subject: [PATCH 24/30] Fixes test

---
 .../tests_manual/test_gm_fruit.py               | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
index 9ed73158a45..de79d6488f9 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_gm_fruit.py
@@ -42,12 +42,8 @@ class TestGmFruit(unittest.TestCase):
         assert isinstance(fruit, frozendict.frozendict)
         assert isinstance(fruit, GmFruit)
         # check its properties
-        self.assertEqual(fruit.lengthCm, length_cm)
         self.assertEqual(fruit['lengthCm'], length_cm)
-        self.assertEqual(getattr(fruit, 'lengthCm'), length_cm)
-        self.assertEqual(fruit.color, color)
         self.assertEqual(fruit['color'], color)
-        self.assertEqual(getattr(fruit, 'color'), color)
 
         # check the dict representation
         self.assertEqual(
@@ -96,15 +92,9 @@ class TestGmFruit(unittest.TestCase):
             cultivar=cultivar,
             length_cm=length_cm
         )
-        self.assertEqual(fruit.color, color)
         self.assertEqual(fruit['color'], color)
-        self.assertEqual(getattr(fruit, 'color'), color)
-        self.assertEqual(fruit.cultivar, cultivar)
         self.assertEqual(fruit['cultivar'], cultivar)
-        self.assertEqual(getattr(fruit, 'cultivar'), cultivar)
-        self.assertEqual(fruit.length_cm, length_cm)
         self.assertEqual(fruit['length_cm'], length_cm)
-        self.assertEqual(getattr(fruit, 'length_cm'), length_cm)
 
         # make an instance of GmFruit, a composed schema anyOf model
         # apple test
@@ -113,16 +103,9 @@ class TestGmFruit(unittest.TestCase):
         origin = 'California'
         fruit = GmFruit(color=color, cultivar=cultivar, origin=origin)
         # check its properties
-        self.assertEqual(fruit.color, color)
         self.assertEqual(fruit['color'], color)
-        self.assertEqual(getattr(fruit, 'color'), color)
-        self.assertEqual(fruit.cultivar, cultivar)
         self.assertEqual(fruit['cultivar'], cultivar)
-        self.assertEqual(getattr(fruit, 'cultivar'), cultivar)
-
-        self.assertEqual(fruit.origin, origin)
         self.assertEqual(fruit['origin'], origin)
-        self.assertEqual(getattr(fruit, 'origin'), origin)
 
         # check the dict representation
         self.assertEqual(
-- 
GitLab


From 78b231fe5b33f11011b40d1cb65358a83c147139 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 08:51:17 -0700
Subject: [PATCH 25/30] Fixes two tests

---
 .../python-experimental/tests_manual/test_drawing.py  | 11 ++++++-----
 .../test_object_with_inline_composition_property.py   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py
index 11a4640f6af..2febc75e362 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_drawing.py
@@ -116,10 +116,10 @@ class TestDrawing(unittest.TestCase):
         self.assertEqual(len(inst["shapes"]), 1)
         from petstore_api.model.triangle_interface import TriangleInterface
         shapes = inst["shapes"]
-        assert isinstance(inst["shapes"][0], shape.Shape)
-        assert isinstance(inst["shapes"][0], Triangle)
-        assert isinstance(inst["shapes"][0], EquilateralTriangle)
-        assert isinstance(inst["shapes"][0], TriangleInterface)
+        assert isinstance(shapes[0], shape.Shape)
+        assert isinstance(shapes[0], Triangle)
+        assert isinstance(shapes[0], EquilateralTriangle)
+        assert isinstance(shapes[0], TriangleInterface)
 
     def test_deserialize_oneof_reference_with_null_type(self):
         """
@@ -158,7 +158,8 @@ class TestDrawing(unittest.TestCase):
         assert isinstance(inst, Drawing)
         self.assertFalse('mainShape' in inst)
         self.assertTrue('nullableShape' in inst)
-        self.assertTrue(isinstance(inst.nullableShape, NoneClass))
+        self.assertTrue(isinstance(inst["nullableShape"], NoneClass))
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_with_inline_composition_property.py
index dea1d7bce6a..8105e51eab2 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_with_inline_composition_property.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_with_inline_composition_property.py
@@ -23,11 +23,11 @@ class TestObjectWithInlineCompositionProperty(unittest.TestCase):
         model = ObjectWithInlineCompositionProperty(someProp='a')
         self.assertTrue(
             isinstance(
-                model.someProp,
+                model["someProp"],
                 ObjectWithInlineCompositionProperty.MetaOapg.properties.someProp
             )
         )
-        self.assertTrue(isinstance(model.someProp, schemas.StrSchema))
+        self.assertTrue(isinstance(model["someProp"], schemas.StrSchema))
 
         # error thrown on length < 1
         with self.assertRaises(exceptions.ApiValueError):
-- 
GitLab


From 6f6a94b2ae069bb5786a6639f17c933946ac3366 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 09:02:15 -0700
Subject: [PATCH 26/30] Fixes two tests

---
 .../python-experimental/schemas.handlebars         |  3 ++-
 .../python-experimental/petstore_api/schemas.py    |  3 ++-
 .../python-experimental/tests_manual/test_fruit.py | 10 ++--------
 .../test_object_model_with_ref_props.py            | 14 +++++++-------
 4 files changed, 13 insertions(+), 17 deletions(-)

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 965ef89a80b..38eb9f86dc0 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/schemas.handlebars
@@ -1860,7 +1860,8 @@ class ComposedSchema(
     StrBase,
     BoolBase,
     NoneBase,
-    Schema
+    Schema,
+    NoneFrozenDictTupleStrDecimalBoolMixin
 ):
     @classmethod
     def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
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 b637c0cb2d0..ccd5e0e5da1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/schemas.py
@@ -1867,7 +1867,8 @@ class ComposedSchema(
     StrBase,
     BoolBase,
     NoneBase,
-    Schema
+    Schema,
+    NoneFrozenDictTupleStrDecimalBoolMixin
 ):
     @classmethod
     def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
index 0a7abfba25f..813102400cf 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_fruit.py
@@ -30,13 +30,11 @@ class TestFruit(unittest.TestCase):
         color = 'yellow'
         fruit = Fruit(lengthCm=length_cm, color=color)
         # check its properties
-        self.assertEqual(fruit.lengthCm, length_cm)
         self.assertEqual(fruit['lengthCm'], length_cm)
         self.assertEqual(fruit.get('lengthCm'), length_cm)
-        self.assertEqual(getattr(fruit, 'lengthCm'), length_cm)
-        self.assertEqual(fruit.color, color)
         self.assertEqual(fruit['color'], color)
-        self.assertEqual(getattr(fruit, 'color'), color)
+        self.assertEqual(fruit.get('color'), color)
+
         # check the dict representation
         self.assertEqual(
             fruit,
@@ -100,12 +98,8 @@ class TestFruit(unittest.TestCase):
         cultivar = 'golden delicious'
         fruit = Fruit(color=color, cultivar=cultivar)
         # check its properties
-        self.assertEqual(fruit.color, color)
         self.assertEqual(fruit['color'], color)
-        self.assertEqual(getattr(fruit, 'color'), color)
-        self.assertEqual(fruit.cultivar, cultivar)
         self.assertEqual(fruit['cultivar'], cultivar)
-        self.assertEqual(getattr(fruit, 'cultivar'), cultivar)
         # check the dict representation
         self.assertEqual(
             fruit,
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py
index f6e885111ab..cd5ded5a673 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_object_model_with_ref_props.py
@@ -35,13 +35,13 @@ class TestObjectModelWithRefProps(unittest.TestCase):
         assert isinstance(inst, ObjectModelWithRefProps)
         assert isinstance(inst, frozendict.frozendict)
         assert set(inst.keys()) == {"myNumber", "myString", "myBoolean"}
-        assert inst.myNumber == 15.0
-        assert isinstance(inst.myNumber, NumberWithValidations)
-        assert inst.myString == 'a'
-        assert isinstance(inst.myString, ObjectModelWithRefProps.MetaOapg.properties.myString)
-        assert bool(inst.myBoolean) is True
-        assert isinstance(inst.myBoolean, ObjectModelWithRefProps.MetaOapg.properties.myBoolean)
-        assert isinstance(inst.myBoolean, BoolClass)
+        assert inst["myNumber"] == 15.0
+        assert isinstance(inst["myNumber"], NumberWithValidations)
+        assert inst["myString"] == 'a'
+        assert isinstance(inst["myString"], ObjectModelWithRefProps.MetaOapg.properties.myString)
+        assert bool(inst["myBoolean"]) is True
+        assert isinstance(inst["myBoolean"], ObjectModelWithRefProps.MetaOapg.properties.myBoolean)
+        assert isinstance(inst["myBoolean"], BoolClass)
 
 
 if __name__ == '__main__':
-- 
GitLab


From ba982f6867b31207600b9751a5d52cf2ffc565cd Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 09:21:46 -0700
Subject: [PATCH 27/30] Tests fixed

---
 .../python-experimental/api_client.handlebars |  2 +-
 .../petstore_api/api_client.py                |  2 +-
 .../tests_manual/test_deserialization.py      | 32 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
index ee1334c89ac..bca1ff34f96 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars
@@ -771,7 +771,7 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]]
+    body: typing.Union[Unset, Schema]
     headers: typing.Union[Unset, typing.List[HeaderParameter]]
 
     def __init__(
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
index cac99fc1e11..601fa61e8a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
@@ -775,7 +775,7 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]]
+    body: typing.Union[Unset, Schema]
     headers: typing.Union[Unset, typing.List[HeaderParameter]]
 
     def __init__(
diff --git a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py
index 492a0e4f44b..c36f1c84bfe 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests_manual/test_deserialization.py
@@ -62,8 +62,8 @@ class DeserializationTests(unittest.TestCase):
         deserialized = _response_for_200.deserialize(response, self.configuration)
         body = deserialized.body
         self.assertTrue(isinstance(body, equilateral_triangle.EquilateralTriangle))
-        self.assertEqual(body.shapeType, 'Triangle')
-        self.assertEqual(body.triangleType, 'EquilateralTriangle')
+        self.assertEqual(body['shapeType'], 'Triangle')
+        self.assertEqual(body['triangleType'], 'EquilateralTriangle')
 
         # invalid quadrilateralType, second discriminator value
         data = {
@@ -101,9 +101,9 @@ class DeserializationTests(unittest.TestCase):
         deserialized = _response_for_200.deserialize(response, self.configuration)
         body = deserialized.body
         self.assertTrue(isinstance(body, dog.Dog))
-        self.assertEqual(body.className, 'Dog')
-        self.assertEqual(body.color, 'white')
-        self.assertEqual(body.breed, 'Jack Russel Terrier')
+        self.assertEqual(body['className'], 'Dog')
+        self.assertEqual(body['color'], 'white')
+        self.assertEqual(body['breed'], 'Jack Russel Terrier')
 
     def test_regex_constraint(self):
         """
@@ -168,8 +168,8 @@ class DeserializationTests(unittest.TestCase):
         deserialized = _response_for_200.deserialize(response, self.configuration)
         body = deserialized.body
         self.assertTrue(isinstance(body, whale.Whale))
-        self.assertEqual(bool(body.hasBaleen), has_baleen)
-        self.assertEqual(bool(body.hasTeeth), has_teeth)
+        self.assertEqual(bool(body['hasBaleen']), has_baleen)
+        self.assertEqual(bool(body['hasTeeth']), has_teeth)
         self.assertEqual(body.className, class_name)
 
         # zebra test
@@ -183,7 +183,7 @@ class DeserializationTests(unittest.TestCase):
         deserialized = _response_for_200.deserialize(response, self.configuration)
         body = deserialized.body
         self.assertTrue(isinstance(body, zebra.Zebra))
-        self.assertEqual(body.type, zebra_type)
+        self.assertEqual(body['type'], zebra_type)
         self.assertEqual(body.className, class_name)
 
     def test_deserialize_float_value(self):
@@ -269,11 +269,11 @@ class DeserializationTests(unittest.TestCase):
         deserialized = _response_for_200.deserialize(response, self.configuration)
         body = deserialized.body
         self.assertTrue(isinstance(body, dog.Dog))
-        self.assertEqual(body.className, 'Dog')
-        self.assertEqual(body.color, 'brown')
-        self.assertEqual(body.breed, 'golden retriever')
-        self.assertEqual(body.group, 'Terrier Group')
-        self.assertEqual(body.size, 'medium')
+        self.assertEqual(body['className'], 'Dog')
+        self.assertEqual(body['color'], 'brown')
+        self.assertEqual(body['breed'], 'golden retriever')
+        self.assertEqual(body['group'], 'Terrier Group')
+        self.assertEqual(body['size'], 'medium')
 
         # The 'zebra' schema allows additional properties by explicitly setting
         # additionalProperties: true.
@@ -296,9 +296,9 @@ class DeserializationTests(unittest.TestCase):
         deserialized = _response_for_200.deserialize(response, self.configuration)
         body = deserialized.body
         self.assertTrue(isinstance(body, zebra.Zebra))
-        self.assertEqual(body.className, 'zebra')
-        self.assertEqual(body.type, 'plains')
-        self.assertEqual(bool(body.p1), True)
+        self.assertEqual(body['className'], 'zebra')
+        self.assertEqual(body['type'], 'plains')
+        self.assertEqual(bool(body['p1']), True)
 
         # The 'bananaReq' schema disallows additional properties by explicitly setting
         # additionalProperties: false
-- 
GitLab


From ce6db9d78934138678ebd6eb16cfffcdf1b2b7c6 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 10:04:13 -0700
Subject: [PATCH 28/30] Unit test sample regerated, fixed unset addprops
 required type hint issue

---
 .../openapitools/codegen/DefaultCodegen.java  |   3 -
 .../property_type_hints.handlebars            |  20 +-
 .../property_type_hints_required.handlebars   |  19 ++
 .../.openapi-generator/VERSION                |   2 +-
 .../python-experimental/README.md             |   8 +-
 .../docs/apis/tags/ContentTypeJsonApi.md      | 208 +++++++-----------
 .../docs/apis/tags/FormatApi.md               | 126 +++++------
 .../docs/apis/tags/ModelNotApi.md             |  28 +--
 .../docs/apis/tags/OperationRequestBodyApi.md | 104 ++++-----
 .../docs/apis/tags/PathPostApi.md             | 208 +++++++-----------
 .../docs/apis/tags/RefApi.md                  |  14 +-
 .../docs/apis/tags/RequiredApi.md             |  26 +--
 .../ResponseContentContentTypeSchemaApi.md    | 104 ++++-----
 .../docs/apis/tags/TypeApi.md                 |  14 +-
 ...pertiesAllowsASchemaWhichShouldValidate.md |   2 +-
 ...AdditionalpropertiesAreAllowedByDefault.md |   2 +-
 .../AdditionalpropertiesCanExistByItself.md   |   2 +-
 ...nalpropertiesShouldNotLookInApplicators.md |   2 +-
 .../python-experimental/docs/models/Allof.md  |   7 +-
 .../models/AllofCombinedWithAnyofOneof.md     |   7 +-
 .../docs/models/AllofSimpleTypes.md           |   7 +-
 .../docs/models/AllofWithBaseSchema.md        |   2 +-
 .../docs/models/AllofWithOneEmptySchema.md    |   7 +-
 .../models/AllofWithTheFirstEmptySchema.md    |   7 +-
 .../models/AllofWithTheLastEmptySchema.md     |   7 +-
 .../docs/models/AllofWithTwoEmptySchemas.md   |   7 +-
 .../python-experimental/docs/models/Anyof.md  |   7 +-
 .../docs/models/AnyofComplexTypes.md          |   7 +-
 .../docs/models/AnyofWithOneEmptySchema.md    |   7 +-
 .../python-experimental/docs/models/ByInt.md  |   7 +-
 .../docs/models/ByNumber.md                   |   7 +-
 .../docs/models/BySmallNumber.md              |   7 +-
 .../docs/models/DateTimeFormat.md             |   7 +-
 .../docs/models/EmailFormat.md                |   7 +-
 .../docs/models/EnumsInProperties.md          |   2 +-
 .../docs/models/ForbiddenProperty.md          |   2 +-
 .../docs/models/HostnameFormat.md             |   7 +-
 .../models/InvalidStringValueForDefault.md    |   2 +-
 .../docs/models/Ipv4Format.md                 |   7 +-
 .../docs/models/Ipv6Format.md                 |   7 +-
 .../docs/models/JsonPointerFormat.md          |   7 +-
 .../docs/models/MaximumValidation.md          |   7 +-
 .../MaximumValidationWithUnsignedInteger.md   |   7 +-
 .../docs/models/MaxitemsValidation.md         |   7 +-
 .../docs/models/MaxlengthValidation.md        |   7 +-
 .../Maxproperties0MeansTheObjectIsEmpty.md    |   7 +-
 .../docs/models/MaxpropertiesValidation.md    |   7 +-
 .../docs/models/MinimumValidation.md          |   7 +-
 .../MinimumValidationWithSignedInteger.md     |   7 +-
 .../docs/models/MinitemsValidation.md         |   7 +-
 .../docs/models/MinlengthValidation.md        |   7 +-
 .../docs/models/MinpropertiesValidation.md    |   7 +-
 .../docs/models/ModelNot.md                   |   7 +-
 .../NestedAllofToCheckValidationSemantics.md  |   7 +-
 .../NestedAnyofToCheckValidationSemantics.md  |   7 +-
 .../NestedOneofToCheckValidationSemantics.md  |   7 +-
 .../docs/models/NotMoreComplexSchema.md       |   7 +-
 .../docs/models/ObjectPropertiesValidation.md |   2 +-
 .../python-experimental/docs/models/Oneof.md  |   7 +-
 .../docs/models/OneofComplexTypes.md          |   7 +-
 .../docs/models/OneofWithEmptySchema.md       |   7 +-
 .../docs/models/OneofWithRequired.md          |   7 +-
 .../docs/models/PatternIsNotAnchored.md       |   7 +-
 .../docs/models/PatternValidation.md          |   7 +-
 .../models/PropertiesWithEscapedCharacters.md |   2 +-
 .../PropertyNamedRefThatIsNotAReference.md    |   2 +-
 .../docs/models/RefInAdditionalproperties.md  |   2 +-
 .../docs/models/RefInAllof.md                 |   7 +-
 .../docs/models/RefInAnyof.md                 |   7 +-
 .../docs/models/RefInNot.md                   |   7 +-
 .../docs/models/RefInOneof.md                 |   7 +-
 .../docs/models/RefInProperty.md              |   2 +-
 .../docs/models/RequiredDefaultValidation.md  |   2 +-
 .../docs/models/RequiredValidation.md         |   2 +-
 .../docs/models/RequiredWithEmptyArray.md     |   2 +-
 .../models/RequiredWithEscapedCharacters.md   |  13 +-
 ...DoesNotDoAnythingIfThePropertyIsMissing.md |   2 +-
 .../docs/models/UniqueitemsFalseValidation.md |   7 +-
 .../docs/models/UniqueitemsValidation.md      |   7 +-
 .../docs/models/UriFormat.md                  |   7 +-
 .../docs/models/UriReferenceFormat.md         |   7 +-
 .../docs/models/UriTemplateFormat.md          |   7 +-
 .../unit_test_api/api_client.py               |   2 +-
 ...s_allows_a_schema_which_should_validate.py |  28 ++-
 ..._allows_a_schema_which_should_validate.pyi |  28 ++-
 ...tionalproperties_are_allowed_by_default.py |  35 +--
 ...ionalproperties_are_allowed_by_default.pyi |  35 +--
 ...dditionalproperties_can_exist_by_itself.py |  10 +-
 ...ditionalproperties_can_exist_by_itself.pyi |  10 +-
 ...operties_should_not_look_in_applicators.py |  39 ++--
 ...perties_should_not_look_in_applicators.pyi |  39 ++--
 .../unit_test_api/model/allof.py              |  62 +++---
 .../unit_test_api/model/allof.pyi             |  62 +++---
 .../model/allof_combined_with_anyof_oneof.py  |  48 +---
 .../model/allof_combined_with_anyof_oneof.pyi |  54 +----
 .../unit_test_api/model/allof_simple_types.py |  36 +--
 .../model/allof_simple_types.pyi              |  36 +--
 .../model/allof_with_base_schema.py           |  75 ++++---
 .../model/allof_with_base_schema.pyi          |  75 ++++---
 .../model/allof_with_one_empty_schema.py      |  12 +-
 .../model/allof_with_one_empty_schema.pyi     |  12 +-
 .../allof_with_the_first_empty_schema.py      |  12 +-
 .../allof_with_the_first_empty_schema.pyi     |  12 +-
 .../model/allof_with_the_last_empty_schema.py |  12 +-
 .../allof_with_the_last_empty_schema.pyi      |  12 +-
 .../model/allof_with_two_empty_schemas.py     |  12 +-
 .../model/allof_with_two_empty_schemas.pyi    |  12 +-
 .../unit_test_api/model/anyof.py              |  24 +-
 .../unit_test_api/model/anyof.pyi             |  24 +-
 .../model/anyof_complex_types.py              |  62 +++---
 .../model/anyof_complex_types.pyi             |  62 +++---
 .../model/anyof_with_base_schema.py           |  24 +-
 .../model/anyof_with_base_schema.pyi          |  24 +-
 .../model/anyof_with_one_empty_schema.py      |  12 +-
 .../model/anyof_with_one_empty_schema.pyi     |  12 +-
 .../unit_test_api/model/by_int.py             |  12 +-
 .../unit_test_api/model/by_int.pyi            |  14 +-
 .../unit_test_api/model/by_number.py          |  12 +-
 .../unit_test_api/model/by_number.pyi         |  14 +-
 .../unit_test_api/model/by_small_number.py    |  12 +-
 .../unit_test_api/model/by_small_number.pyi   |  14 +-
 .../model/enums_in_properties.py              |  31 ++-
 .../model/enums_in_properties.pyi             |  31 ++-
 .../unit_test_api/model/forbidden_property.py |  63 ++----
 .../model/forbidden_property.pyi              |  63 ++----
 .../model/invalid_string_value_for_default.py |  29 +--
 .../invalid_string_value_for_default.pyi      |  29 +--
 .../unit_test_api/model/maximum_validation.py |  12 +-
 .../model/maximum_validation.pyi              |  14 +-
 ...aximum_validation_with_unsigned_integer.py |  12 +-
 ...ximum_validation_with_unsigned_integer.pyi |  14 +-
 .../model/maxitems_validation.py              |  12 +-
 .../model/maxitems_validation.pyi             |  14 +-
 .../model/maxlength_validation.py             |  12 +-
 .../model/maxlength_validation.pyi            |  14 +-
 ...axproperties0_means_the_object_is_empty.py |  12 +-
 ...xproperties0_means_the_object_is_empty.pyi |  14 +-
 .../model/maxproperties_validation.py         |  12 +-
 .../model/maxproperties_validation.pyi        |  14 +-
 .../unit_test_api/model/minimum_validation.py |  12 +-
 .../model/minimum_validation.pyi              |  14 +-
 .../minimum_validation_with_signed_integer.py |  12 +-
 ...minimum_validation_with_signed_integer.pyi |  14 +-
 .../model/minitems_validation.py              |  12 +-
 .../model/minitems_validation.pyi             |  14 +-
 .../model/minlength_validation.py             |  12 +-
 .../model/minlength_validation.pyi            |  14 +-
 .../model/minproperties_validation.py         |  12 +-
 .../model/minproperties_validation.pyi        |  14 +-
 .../unit_test_api/model/model_not.py          |  12 +-
 .../unit_test_api/model/model_not.pyi         |  12 +-
 ...ted_allof_to_check_validation_semantics.py |  24 +-
 ...ed_allof_to_check_validation_semantics.pyi |  24 +-
 ...ted_anyof_to_check_validation_semantics.py |  24 +-
 ...ed_anyof_to_check_validation_semantics.pyi |  24 +-
 ...ted_oneof_to_check_validation_semantics.py |  24 +-
 ...ed_oneof_to_check_validation_semantics.pyi |  24 +-
 .../model/not_more_complex_schema.py          |  41 ++--
 .../model/not_more_complex_schema.pyi         |  41 ++--
 .../model/object_properties_validation.py     |  35 +--
 .../model/object_properties_validation.pyi    |  35 +--
 .../unit_test_api/model/oneof.py              |  24 +-
 .../unit_test_api/model/oneof.pyi             |  24 +-
 .../model/oneof_complex_types.py              |  62 +++---
 .../model/oneof_complex_types.pyi             |  62 +++---
 .../model/oneof_with_base_schema.py           |  24 +-
 .../model/oneof_with_base_schema.pyi          |  24 +-
 .../model/oneof_with_empty_schema.py          |  12 +-
 .../model/oneof_with_empty_schema.pyi         |  12 +-
 .../model/oneof_with_required.py              |  62 +-----
 .../model/oneof_with_required.pyi             |  62 +-----
 .../model/pattern_is_not_anchored.py          |  12 +-
 .../model/pattern_is_not_anchored.pyi         |  14 +-
 .../unit_test_api/model/pattern_validation.py |  12 +-
 .../model/pattern_validation.pyi              |  14 +-
 .../properties_with_escaped_characters.py     |  53 +++--
 .../properties_with_escaped_characters.pyi    |  53 +++--
 ...perty_named_ref_that_is_not_a_reference.py |  28 ++-
 ...erty_named_ref_that_is_not_a_reference.pyi |  28 ++-
 .../model/ref_in_additionalproperties.py      |  10 +-
 .../model/ref_in_additionalproperties.pyi     |  10 +-
 .../unit_test_api/model/ref_in_allof.py       |  12 +-
 .../unit_test_api/model/ref_in_allof.pyi      |  12 +-
 .../unit_test_api/model/ref_in_anyof.py       |  12 +-
 .../unit_test_api/model/ref_in_anyof.pyi      |  12 +-
 .../unit_test_api/model/ref_in_not.py         |  12 +-
 .../unit_test_api/model/ref_in_not.pyi        |  12 +-
 .../unit_test_api/model/ref_in_oneof.py       |  12 +-
 .../unit_test_api/model/ref_in_oneof.pyi      |  12 +-
 .../unit_test_api/model/ref_in_property.py    |  29 +--
 .../unit_test_api/model/ref_in_property.pyi   |  29 +--
 .../model/required_default_validation.py      |  29 +--
 .../model/required_default_validation.pyi     |  29 +--
 .../model/required_validation.py              |  31 ++-
 .../model/required_validation.pyi             |  31 ++-
 .../model/required_with_empty_array.py        |  29 +--
 .../model/required_with_empty_array.pyi       |  29 +--
 .../model/required_with_escaped_characters.py |  33 +--
 .../required_with_escaped_characters.pyi      |  33 +--
 ..._do_anything_if_the_property_is_missing.py |  29 +--
 ...do_anything_if_the_property_is_missing.pyi |  29 +--
 .../model/uniqueitems_false_validation.py     |  12 +-
 .../model/uniqueitems_false_validation.pyi    |  14 +-
 .../model/uniqueitems_validation.py           |  12 +-
 .../model/uniqueitems_validation.pyi          |  14 +-
 .../post.py                                   |  41 ++--
 .../post.pyi                                  |  41 ++--
 .../post.py                                   |  12 +-
 .../post.pyi                                  |  12 +-
 .../post.py                                   |  12 +-
 .../post.pyi                                  |  12 +-
 .../post.py                                   |  33 +--
 .../post.pyi                                  |  33 +--
 .../post.py                                   |  41 ++--
 .../post.pyi                                  |  41 ++--
 .../post.py                                   |  12 +-
 .../post.pyi                                  |  12 +-
 .../post.py                                   |  12 +-
 .../post.pyi                                  |  12 +-
 .../post.py                                   |  33 +--
 .../post.pyi                                  |  33 +--
 .../unit_test_api/schemas.py                  |  66 +++++-
 222 files changed, 1660 insertions(+), 3133 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints_required.handlebars

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 777889ef637..4bef2d1136b 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
@@ -7270,9 +7270,6 @@ public class DefaultCodegen implements CodegenConfig {
                 // required property is not defined in properties, and additionalProperties is true or unset value is CodegenProperty made from empty schema
                 // required property is not defined in properties, and additionalProperties is schema, value is CodegenProperty made from schema
                 if (supportsAdditionalPropertiesWithComposedSchema && !disallowAdditionalPropertiesIfNotPresent) {
-                    if (property.getAdditionalProperties() == null) {
-                        throw new RuntimeException("additionalProperties is unset and should be set in" + schema.toString());
-                    }
                     CodegenProperty cp;
                     if (schema.getAdditionalProperties() == null) {
                         // additionalProperties is null
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 80422bffc63..395c6e2aea1 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,22 +1,10 @@
-{{#or getRequiredVarsMap vars}}
-
-{{/or}}
 {{#if getRequiredVarsMap}}
-{{#each getRequiredVarsMap}}
-{{#with this}}
-{{#unless nameInSnakeCase}}
-{{#if complexType}}
-{{baseName}}: '{{complexType}}'
-{{else}}
-{{#if schemaIsFromAdditionalProperties}}
-{{baseName}}: MetaOapg.additional_properties
+
+{{#if additionalProperties}}
+{{> model_templates/property_type_hints_required }}
 {{else}}
-{{baseName}}: MetaOapg.properties.{{baseName}}
-{{/if}}
+{{> model_templates/property_type_hints_required addPropsUnset=true }}
 {{/if}}
-{{/unless}}
-{{/with}}
-{{/each}}
 {{/if}}
 {{#if additionalProperties}}
 {{> model_templates/property_getitems_with_addprops }}
diff --git a/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints_required.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints_required.handlebars
new file mode 100644
index 00000000000..2a265d61d77
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/python-experimental/model_templates/property_type_hints_required.handlebars
@@ -0,0 +1,19 @@
+{{#each getRequiredVarsMap}}
+{{#with this}}
+{{#unless nameInSnakeCase}}
+{{#if complexType}}
+{{baseName}}: '{{complexType}}'
+{{else}}
+{{#if schemaIsFromAdditionalProperties}}
+{{#if addPropsUnset}}
+{{baseName}}: schemas.AnyTypeSchema
+{{else}}
+{{baseName}}: MetaOapg.additional_properties
+{{/if}}
+{{else}}
+{{baseName}}: MetaOapg.properties.{{baseName}}
+{{/if}}
+{{/if}}
+{{/unless}}
+{{/with}}
+{{/each}}
\ No newline at end of file
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION
index 66672d4e9d3..717311e32e3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION
@@ -1 +1 @@
-6.1.0-SNAPSHOT
\ No newline at end of file
+unset
\ No newline at end of file
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
index 16dd801510d..69f27fe79b1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
@@ -42,13 +42,11 @@ object schema properties as classes
     keyword in one schema, and include a format constraint in another schema
     - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
     - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. If object(dict) properties are accessed and they do not exist, then two things could happen
+7. If object(dict) properties are accessed and they do not exist then schemas.unset will be returned
     - When accessed with model_instance.someProp or model_instance["someProp"] and someProp is not in the payload,
-    then two possible results can be returned. If someProp is defined in any of the validated schemas
-    where it will have to be optional, then the value schemas.unset will be returned.
-    If someProp was not defined as an explicit property in any of those schemas, then a KeyError will be raised.
+    then schemas.unset will be returned.
     - This was done so type hints for optional properties could show that schemas.Unset is a valid value.
-    - So you will need to update code to handle thrown KeyErrors or schema.unset values
+    - So you will need to update code to schema.unset values because KeyErrors will not be thrown
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ContentTypeJsonApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ContentTypeJsonApi.md
index 2633dfa1e86..367e05a0e8a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ContentTypeJsonApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ContentTypeJsonApi.md
@@ -3108,10 +3108,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -3185,10 +3184,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -3245,10 +3243,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -3322,10 +3319,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -4344,10 +4340,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4421,10 +4416,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -4890,10 +4884,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4967,10 +4960,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5027,10 +5019,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -5104,10 +5095,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5164,10 +5154,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -5241,10 +5230,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -7364,10 +7352,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -7441,10 +7428,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -7501,10 +7487,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -7578,10 +7563,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -8182,10 +8166,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 ### Return Types, Responses
 
@@ -8259,10 +8242,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 
 **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
@@ -10105,10 +10087,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -10183,10 +10164,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -10928,16 +10908,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -11011,16 +10984,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -11762,10 +11728,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -11839,10 +11804,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -11899,10 +11863,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -11976,10 +11939,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -12036,10 +11998,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -12113,10 +12074,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/FormatApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/FormatApi.md
index d6b9cc3476b..b50dd1718e1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/FormatApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/FormatApi.md
@@ -70,10 +70,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -147,10 +146,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -207,10 +205,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -284,10 +281,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -344,10 +340,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -421,10 +416,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -481,10 +475,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -558,10 +551,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -618,10 +610,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -695,10 +686,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -755,10 +745,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -832,10 +821,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -892,10 +880,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -969,10 +956,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -1029,10 +1015,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -1106,10 +1091,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -1166,10 +1150,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -1243,10 +1226,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ModelNotApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ModelNotApi.md
index 3ce6d170ef9..453703a27d0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ModelNotApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ModelNotApi.md
@@ -195,10 +195,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -272,10 +271,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -332,10 +330,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -409,10 +406,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/OperationRequestBodyApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/OperationRequestBodyApi.md
index 76e909951ff..511c2cea699 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/OperationRequestBodyApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/OperationRequestBodyApi.md
@@ -1699,10 +1699,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -1773,10 +1772,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -2368,10 +2366,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -2663,10 +2660,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -2737,10 +2733,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -2811,10 +2806,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4003,10 +3997,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4077,10 +4070,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4445,10 +4437,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 ### Return Types, Responses
 
@@ -5486,10 +5477,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -5930,16 +5920,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -6381,10 +6364,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -6455,10 +6437,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -6529,10 +6510,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/PathPostApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/PathPostApi.md
index ebc1a845d5d..79c6ba7c8ff 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/PathPostApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/PathPostApi.md
@@ -3108,10 +3108,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -3185,10 +3184,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -3245,10 +3243,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -3322,10 +3319,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -4344,10 +4340,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4421,10 +4416,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -4890,10 +4884,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -4967,10 +4960,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5027,10 +5019,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -5104,10 +5095,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5164,10 +5154,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -5241,10 +5230,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -7364,10 +7352,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -7441,10 +7428,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -7501,10 +7487,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -7578,10 +7563,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -8182,10 +8166,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 ### Return Types, Responses
 
@@ -8259,10 +8242,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 
 **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
@@ -10105,10 +10087,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -10183,10 +10164,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -10928,16 +10908,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -11011,16 +10984,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -11762,10 +11728,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -11839,10 +11804,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -11899,10 +11863,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -11976,10 +11939,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -12036,10 +11998,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -12113,10 +12074,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RefApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RefApi.md
index 8599080d6c0..5fafdd5b995 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RefApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RefApi.md
@@ -758,10 +758,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -836,10 +835,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RequiredApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RequiredApi.md
index 28f5ac7d1f8..f7d204ecccf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RequiredApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/RequiredApi.md
@@ -471,16 +471,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 ### Return Types, Responses
 
@@ -554,16 +547,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ResponseContentContentTypeSchemaApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ResponseContentContentTypeSchemaApi.md
index 3cc97fed49d..c6daa966d11 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ResponseContentContentTypeSchemaApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/ResponseContentContentTypeSchemaApi.md
@@ -1464,10 +1464,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -1527,10 +1526,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -2031,10 +2029,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -2282,10 +2279,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -2345,10 +2341,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -2408,10 +2403,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -3416,10 +3410,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -3479,10 +3472,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -3792,10 +3784,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 
 **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
@@ -4675,10 +4666,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5053,16 +5043,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5436,10 +5419,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5499,10 +5481,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
@@ -5562,10 +5543,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 
 **bool, date, datetime, dict, float, int, list, str, none_type**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/TypeApi.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/TypeApi.md
index 8172e9a971a..974e334ff7b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/TypeApi.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/apis/tags/TypeApi.md
@@ -745,10 +745,9 @@ skip_deserialization | bool | default is False | when True, headers and body wil
 
 #### SchemaForRequestBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 ### Return Types, Responses
 
@@ -822,10 +821,9 @@ headers | Unset | headers were not defined |
 
 #### SchemaFor200ResponseBodyApplicationJson
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** |  | 
 
 
 **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAllowsASchemaWhichShouldValidate.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAllowsASchemaWhichShouldValidate.md
index 7405775c25d..1734c9c1162 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAllowsASchemaWhichShouldValidate.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAllowsASchemaWhichShouldValidate.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
 **bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAreAllowedByDefault.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAreAllowedByDefault.md
index ab05b51a482..0ec550aaeed 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAreAllowedByDefault.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesAreAllowedByDefault.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
 **bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesCanExistByItself.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesCanExistByItself.md
index eadf2abc88c..1ccfed13076 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesCanExistByItself.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesCanExistByItself.md
@@ -3,7 +3,7 @@
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesShouldNotLookInApplicators.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesShouldNotLookInApplicators.md
index ac7f703a2b4..af1fc451d6a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesShouldNotLookInApplicators.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AdditionalpropertiesShouldNotLookInApplicators.md
@@ -3,7 +3,7 @@
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | **bool** | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Allof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Allof.md
index 4f0f61d3541..7aecfb74655 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Allof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Allof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof.Allof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AllofCombinedWithAnyofOneof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofCombinedWithAnyofOneof.md
index 41f89e21048..b45423da634 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofCombinedWithAnyofOneof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofCombinedWithAnyofOneof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AllofSimpleTypes.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofSimpleTypes.md
index 3cf3c5dcfa2..4ba6814606b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofSimpleTypes.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofSimpleTypes.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof_simple_types.AllofSimpleTypes
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AllofWithBaseSchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithBaseSchema.md
index d7f824cab29..130896ffc43 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithBaseSchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithBaseSchema.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **int** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithOneEmptySchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithOneEmptySchema.md
index b79af718ebc..f483ce75836 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithOneEmptySchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithOneEmptySchema.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof_with_one_empty_schema.AllofWithOneEmptySchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheFirstEmptySchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheFirstEmptySchema.md
index 378cfffcb3b..12e8a7a3d28 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheFirstEmptySchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheFirstEmptySchema.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheLastEmptySchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheLastEmptySchema.md
index 7f8e69b21d9..701ece7dfbb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheLastEmptySchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTheLastEmptySchema.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AllofWithTwoEmptySchemas.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTwoEmptySchemas.md
index dcd5d29edba..a7c9417738a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTwoEmptySchemas.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AllofWithTwoEmptySchemas.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/Anyof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Anyof.md
index bd208811c26..1f7a76653e5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Anyof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Anyof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.anyof.Anyof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AnyofComplexTypes.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AnyofComplexTypes.md
index 54c8c956892..a57ec36c8d9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AnyofComplexTypes.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AnyofComplexTypes.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.anyof_complex_types.AnyofComplexTypes
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/AnyofWithOneEmptySchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AnyofWithOneEmptySchema.md
index d8417835d68..8c71b272490 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AnyofWithOneEmptySchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/AnyofWithOneEmptySchema.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.anyof_with_one_empty_schema.AnyofWithOneEmptySchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/ByInt.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ByInt.md
index ea17a67008c..28e74c7ad93 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ByInt.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ByInt.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.by_int.ByInt
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/ByNumber.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ByNumber.md
index 7de039eb136..d8a2d8bd9e7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ByNumber.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ByNumber.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.by_number.ByNumber
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/BySmallNumber.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/BySmallNumber.md
index a5b234dd9e9..035e96c3897 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/BySmallNumber.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/BySmallNumber.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.by_small_number.BySmallNumber
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/DateTimeFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/DateTimeFormat.md
index defdf94d1ab..cd93630e5da 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/DateTimeFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/DateTimeFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.date_time_format.DateTimeFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/EmailFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/EmailFormat.md
index bad9bc805d9..f470711bd3d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/EmailFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/EmailFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.email_format.EmailFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/EnumsInProperties.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/EnumsInProperties.md
index 322f4776069..037c3272892 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/EnumsInProperties.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/EnumsInProperties.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | 
 **foo** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ForbiddenProperty.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ForbiddenProperty.md
index 59d2f65b0af..f22f447f042 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ForbiddenProperty.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ForbiddenProperty.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/HostnameFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/HostnameFormat.md
index 23b50598c40..5f7841a4da3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/HostnameFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/HostnameFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.hostname_format.HostnameFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/InvalidStringValueForDefault.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/InvalidStringValueForDefault.md
index d72d1e97976..b6b67f4d661 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/InvalidStringValueForDefault.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/InvalidStringValueForDefault.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **bar** | **str** |  | [optional]  if omitted the server will use the default value of "bad"
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv4Format.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv4Format.md
index 6d4d4223188..59e71b41d6d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv4Format.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv4Format.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.ipv4_format.Ipv4Format
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/Ipv6Format.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv6Format.md
index 833c67538cd..3afa0fd45bb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv6Format.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Ipv6Format.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.ipv6_format.Ipv6Format
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/JsonPointerFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/JsonPointerFormat.md
index 1d20321cd82..f8b038630f8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/JsonPointerFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/JsonPointerFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.json_pointer_format.JsonPointerFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MaximumValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaximumValidation.md
index ec702050d43..0546a3c83d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaximumValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaximumValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.maximum_validation.MaximumValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MaximumValidationWithUnsignedInteger.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaximumValidationWithUnsignedInteger.md
index 529cdb8e7a6..80be7af56fe 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaximumValidationWithUnsignedInteger.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaximumValidationWithUnsignedInteger.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MaxitemsValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxitemsValidation.md
index afffb76e49b..46aea83239d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxitemsValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxitemsValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.maxitems_validation.MaxitemsValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MaxlengthValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxlengthValidation.md
index d94586e49e4..5630336c318 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxlengthValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxlengthValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.maxlength_validation.MaxlengthValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/Maxproperties0MeansTheObjectIsEmpty.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Maxproperties0MeansTheObjectIsEmpty.md
index eeab8353238..f5ce6144fc0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Maxproperties0MeansTheObjectIsEmpty.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Maxproperties0MeansTheObjectIsEmpty.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MaxpropertiesValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxpropertiesValidation.md
index 2b6d38dd43c..7cc9ad6677e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxpropertiesValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MaxpropertiesValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.maxproperties_validation.MaxpropertiesValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MinimumValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinimumValidation.md
index 748dbaf3c30..ab71f5d940e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinimumValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinimumValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.minimum_validation.MinimumValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MinimumValidationWithSignedInteger.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinimumValidationWithSignedInteger.md
index f5e9945a14c..d012fe5d03e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinimumValidationWithSignedInteger.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinimumValidationWithSignedInteger.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MinitemsValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinitemsValidation.md
index 00a7a51751d..3ad93f5569d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinitemsValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinitemsValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.minitems_validation.MinitemsValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MinlengthValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinlengthValidation.md
index 13691b9c6f3..da116e7a929 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinlengthValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinlengthValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.minlength_validation.MinlengthValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/MinpropertiesValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinpropertiesValidation.md
index 36f0fa66813..2998bfc62bd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinpropertiesValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/MinpropertiesValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.minproperties_validation.MinpropertiesValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/ModelNot.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ModelNot.md
index c7b54544b21..ee4ed4cfa72 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ModelNot.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ModelNot.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.model_not.ModelNot
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/NestedAllofToCheckValidationSemantics.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedAllofToCheckValidationSemantics.md
index 75ac8202ccc..4b095d40fec 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedAllofToCheckValidationSemantics.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedAllofToCheckValidationSemantics.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/NestedAnyofToCheckValidationSemantics.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedAnyofToCheckValidationSemantics.md
index a2cf8334841..cbccae2bae1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedAnyofToCheckValidationSemantics.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedAnyofToCheckValidationSemantics.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/NestedOneofToCheckValidationSemantics.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedOneofToCheckValidationSemantics.md
index d4ac33d68e8..a907791fad1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedOneofToCheckValidationSemantics.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NestedOneofToCheckValidationSemantics.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/NotMoreComplexSchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NotMoreComplexSchema.md
index 410ca865838..82de4a12f80 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NotMoreComplexSchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/NotMoreComplexSchema.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.not_more_complex_schema.NotMoreComplexSchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/ObjectPropertiesValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ObjectPropertiesValidation.md
index c834731f3a4..65b4adce2e2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ObjectPropertiesValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/ObjectPropertiesValidation.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **int** |  | [optional] 
 **bar** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Oneof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Oneof.md
index 4764e2f124a..e7ad083c8d7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Oneof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/Oneof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.oneof.Oneof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/OneofComplexTypes.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofComplexTypes.md
index 585b08b2b1d..c94fbe5b9bd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofComplexTypes.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofComplexTypes.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.oneof_complex_types.OneofComplexTypes
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/OneofWithEmptySchema.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofWithEmptySchema.md
index 6c2d9734b83..89db1cc4ea4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofWithEmptySchema.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofWithEmptySchema.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.oneof_with_empty_schema.OneofWithEmptySchema
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/OneofWithRequired.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofWithRequired.md
index 5924063332f..e979650c62f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofWithRequired.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/OneofWithRequired.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.oneof_with_required.OneofWithRequired
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+**object** |  | 
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/PatternIsNotAnchored.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PatternIsNotAnchored.md
index 2d877a07d14..ed984ca2301 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PatternIsNotAnchored.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PatternIsNotAnchored.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.pattern_is_not_anchored.PatternIsNotAnchored
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/PatternValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PatternValidation.md
index 94f07c7e36b..71b797d8c9e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PatternValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PatternValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.pattern_validation.PatternValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/PropertiesWithEscapedCharacters.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertiesWithEscapedCharacters.md
index b1dffb35ce2..f67ca9962e5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertiesWithEscapedCharacters.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertiesWithEscapedCharacters.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **foo\rbar** | **int, float** |  | [optional] 
 **foo\tbar** | **int, float** |  | [optional] 
 **foo\fbar** | **int, float** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertyNamedRefThatIsNotAReference.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertyNamedRefThatIsNotAReference.md
index 86ee3023102..2bbd88be7f3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertyNamedRefThatIsNotAReference.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/PropertyNamedRefThatIsNotAReference.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **$ref** | **str** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAdditionalproperties.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAdditionalproperties.md
index 402ab096af1..daa10fd603c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAdditionalproperties.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAdditionalproperties.md
@@ -3,7 +3,7 @@
 #### Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**any string name** | **PropertyNamedRefThatIsNotAReference** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | [**PropertyNamedRefThatIsNotAReference**](PropertyNamedRefThatIsNotAReference.md) | any string name can be used but the value must be the correct type | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAllof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAllof.md
index f5acdad1d0c..f199bbbb997 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAllof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAllof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.ref_in_allof.RefInAllof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/RefInAnyof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAnyof.md
index 05bf2a58260..5019c94b633 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAnyof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInAnyof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.ref_in_anyof.RefInAnyof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/RefInNot.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInNot.md
index 8c7552bd04f..9a18c1f8342 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInNot.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInNot.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.ref_in_not.RefInNot
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/RefInOneof.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInOneof.md
index 163a3e29db3..72b6741cc83 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInOneof.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInOneof.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.ref_in_oneof.RefInOneof
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/RefInProperty.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInProperty.md
index f5b89b42122..080017b607e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInProperty.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RefInProperty.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **a** | [**PropertyNamedRefThatIsNotAReference**](PropertyNamedRefThatIsNotAReference.md) |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredDefaultValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredDefaultValidation.md
index cf0b30aee43..8f7392c90c4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredDefaultValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredDefaultValidation.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredValidation.md
index be066348d7e..5e607797972 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredValidation.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
 **bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEmptyArray.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEmptyArray.md
index 8174e7aa075..80a1f89f9c3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEmptyArray.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEmptyArray.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **foo** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | [optional] 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEscapedCharacters.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEscapedCharacters.md
index c77c8e2c9f3..595b2fce42a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEscapedCharacters.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/RequiredWithEscapedCharacters.md
@@ -1,15 +1,8 @@
 # unit_test_api.model.required_with_escaped_characters.RequiredWithEscapedCharacters
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**foo\&quot;bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\nbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\fbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\tbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\rbar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**foo\\bar** | **bool, date, datetime, dict, float, int, list, str, none_type** |  | 
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.md
index ff2d8c4c278..affadf410e5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.md
@@ -4,7 +4,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **alpha** | **int, float** |  | [optional]  if omitted the server will use the default value of 5
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+**any string name** | dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsFalseValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsFalseValidation.md
index 92e63f9e6f9..32154a6546f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsFalseValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsFalseValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.uniqueitems_false_validation.UniqueitemsFalseValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsValidation.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsValidation.md
index b32dadc7aee..32b707e366f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsValidation.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UniqueitemsValidation.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.uniqueitems_validation.UniqueitemsValidation
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/UriFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriFormat.md
index 83b9c53b118..fec92968cee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.uri_format.UriFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/UriReferenceFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriReferenceFormat.md
index 11a8d355879..2e4c5e33f60 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriReferenceFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriReferenceFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.uri_reference_format.UriReferenceFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/docs/models/UriTemplateFormat.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriTemplateFormat.md
index 9f867a9d82c..ba479d2cda7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriTemplateFormat.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/docs/models/UriTemplateFormat.md
@@ -1,9 +1,8 @@
 # unit_test_api.model.uri_template_format.UriTemplateFormat
 
-#### Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+Type | Description | Notes
+------------- | ------------- | -------------
+typing.Union[dict, frozendict, str, date, datetime, int, float, bool, Decimal, None, list, tuple, bytes] | |
 
 [[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/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
index 1a2e6cab981..4774af5063a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/api_client.py
@@ -775,7 +775,7 @@ class MediaType:
 @dataclass
 class ApiResponse:
     response: urllib3.HTTPResponse
-    body: typing.Union[Unset, typing.Type[Schema]]
+    body: typing.Union[Unset, Schema]
     headers: typing.Union[Unset, typing.List[HeaderParameter]]
 
     def __init__(
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
index a817c8075a2..278fa7fe18e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.py
@@ -42,26 +42,30 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
             }
         additional_properties = schemas.BoolSchema
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
index a817c8075a2..278fa7fe18e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_allows_a_schema_which_should_validate.pyi
@@ -42,26 +42,30 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
             }
         additional_properties = schemas.BoolSchema
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo"], typing.Literal["bar"], str, ]):
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 37474c00d4f..5e80a8aabea 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
@@ -40,29 +40,34 @@ class AdditionalpropertiesAreAllowedByDefault(
                 "foo": foo,
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -70,7 +75,7 @@ class AdditionalpropertiesAreAllowedByDefault(
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AdditionalpropertiesAreAllowedByDefault':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
index 37474c00d4f..5e80a8aabea 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_are_allowed_by_default.pyi
@@ -40,29 +40,34 @@ class AdditionalpropertiesAreAllowedByDefault(
                 "foo": foo,
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -70,7 +75,7 @@ class AdditionalpropertiesAreAllowedByDefault(
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AdditionalpropertiesAreAllowedByDefault':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py
index 8be7c2c5e9e..c76dafd64a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.py
@@ -37,12 +37,10 @@ class AdditionalpropertiesCanExistByItself(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
index 8be7c2c5e9e..c76dafd64a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_can_exist_by_itself.pyi
@@ -37,12 +37,10 @@ class AdditionalpropertiesCanExistByItself(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 e40d82a4804..9bd4e2a173e 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,32 +47,35 @@ class AdditionalpropertiesShouldNotLookInApplicators(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-            
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -100,12 +103,10 @@ class AdditionalpropertiesShouldNotLookInApplicators(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
index e40d82a4804..9bd4e2a173e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/additionalproperties_should_not_look_in_applicators.pyi
@@ -47,32 +47,35 @@ class AdditionalpropertiesShouldNotLookInApplicators(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-            
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -100,12 +103,10 @@ class AdditionalpropertiesShouldNotLookInApplicators(
     
     def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 9200a4d03a3..456007793af 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
@@ -33,7 +33,6 @@ class Allof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -50,7 +49,6 @@ class Allof(
                     __annotations__ = {
                         "bar": bar,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             bar: MetaOapg.properties.bar
@@ -59,23 +57,29 @@ class Allof(
             def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 bar: typing.Union[MetaOapg.properties.bar, int, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -100,7 +104,6 @@ class Allof(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -109,23 +112,29 @@ class Allof(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -151,21 +160,12 @@ class Allof(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Allof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi
index 9200a4d03a3..456007793af 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof.pyi
@@ -33,7 +33,6 @@ class Allof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -50,7 +49,6 @@ class Allof(
                     __annotations__ = {
                         "bar": bar,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             bar: MetaOapg.properties.bar
@@ -59,23 +57,29 @@ class Allof(
             def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 bar: typing.Union[MetaOapg.properties.bar, int, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -100,7 +104,6 @@ class Allof(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -109,23 +112,29 @@ class Allof(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -151,21 +160,12 @@ class Allof(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Allof':
         return super().__new__(
             cls,
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 1b630892dec..8bb0101baa4 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
@@ -33,7 +33,6 @@ class AllofCombinedWithAnyofOneof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -42,24 +41,14 @@ class AllofCombinedWithAnyofOneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 multiple_of = 2
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -75,24 +64,14 @@ class AllofCombinedWithAnyofOneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 multiple_of = 5
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -108,24 +87,14 @@ class AllofCombinedWithAnyofOneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 multiple_of = 3
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -179,21 +148,12 @@ class AllofCombinedWithAnyofOneof(
                 cls.any_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofCombinedWithAnyofOneof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi
index 7d11b8fc9db..d5b7595519f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_combined_with_anyof_oneof.pyi
@@ -33,7 +33,6 @@ class AllofCombinedWithAnyofOneof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -42,23 +41,13 @@ class AllofCombinedWithAnyofOneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
-        
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+        
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -74,23 +63,13 @@ class AllofCombinedWithAnyofOneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
-        
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+        
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -106,23 +85,13 @@ class AllofCombinedWithAnyofOneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
-        
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+        
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -176,21 +145,12 @@ class AllofCombinedWithAnyofOneof(
                 cls.any_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofCombinedWithAnyofOneof':
         return super().__new__(
             cls,
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 5bfc1a0dfc1..b720177edbc 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
@@ -33,7 +33,6 @@ class AllofSimpleTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -42,24 +41,14 @@ class AllofSimpleTypes(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 inclusive_maximum = 30
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -75,24 +64,14 @@ class AllofSimpleTypes(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 inclusive_minimum = 20
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -117,21 +96,12 @@ class AllofSimpleTypes(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofSimpleTypes':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi
index cc3b93f14cf..364f19d0aba 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_simple_types.pyi
@@ -33,7 +33,6 @@ class AllofSimpleTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -42,23 +41,13 @@ class AllofSimpleTypes(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -74,23 +63,13 @@ class AllofSimpleTypes(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -115,21 +94,12 @@ class AllofSimpleTypes(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofSimpleTypes':
         return super().__new__(
             cls,
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 b1787605cb4..c1c4e2415bb 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
@@ -41,7 +41,6 @@ class AllofWithBaseSchema(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -58,7 +57,6 @@ class AllofWithBaseSchema(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -67,23 +65,29 @@ class AllofWithBaseSchema(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -108,7 +112,6 @@ class AllofWithBaseSchema(
                     __annotations__ = {
                         "baz": baz,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             baz: MetaOapg.properties.baz
@@ -117,23 +120,29 @@ class AllofWithBaseSchema(
             def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["baz"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["baz", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["baz", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 baz: typing.Union[MetaOapg.properties.baz, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -166,23 +175,29 @@ class AllofWithBaseSchema(
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         bar: typing.Union[MetaOapg.properties.bar, int, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithBaseSchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi
index b1787605cb4..c1c4e2415bb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_base_schema.pyi
@@ -41,7 +41,6 @@ class AllofWithBaseSchema(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -58,7 +57,6 @@ class AllofWithBaseSchema(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -67,23 +65,29 @@ class AllofWithBaseSchema(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -108,7 +112,6 @@ class AllofWithBaseSchema(
                     __annotations__ = {
                         "baz": baz,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             baz: MetaOapg.properties.baz
@@ -117,23 +120,29 @@ class AllofWithBaseSchema(
             def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["baz"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["baz", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["baz"]) -> MetaOapg.properties.baz: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["baz", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 baz: typing.Union[MetaOapg.properties.baz, None, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_1':
                 return super().__new__(
                     cls,
@@ -166,23 +175,29 @@ class AllofWithBaseSchema(
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         bar: typing.Union[MetaOapg.properties.bar, int, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithBaseSchema':
         return super().__new__(
             cls,
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 a209c24f6c8..7108c5dec72 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
@@ -33,7 +33,6 @@ class AllofWithOneEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
@@ -51,21 +50,12 @@ class AllofWithOneEmptySchema(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithOneEmptySchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi
index a209c24f6c8..7108c5dec72 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_one_empty_schema.pyi
@@ -33,7 +33,6 @@ class AllofWithOneEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.AnyTypeSchema
         
         @classmethod
@@ -51,21 +50,12 @@ class AllofWithOneEmptySchema(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithOneEmptySchema':
         return super().__new__(
             cls,
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 5b5da082706..5628533c3d5 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
@@ -33,7 +33,6 @@ class AllofWithTheFirstEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.AnyTypeSchema
         all_of_1 = schemas.NumberSchema
         
@@ -53,21 +52,12 @@ class AllofWithTheFirstEmptySchema(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithTheFirstEmptySchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi
index 5b5da082706..5628533c3d5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_first_empty_schema.pyi
@@ -33,7 +33,6 @@ class AllofWithTheFirstEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.AnyTypeSchema
         all_of_1 = schemas.NumberSchema
         
@@ -53,21 +52,12 @@ class AllofWithTheFirstEmptySchema(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithTheFirstEmptySchema':
         return super().__new__(
             cls,
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 b15aca5ed89..e94b8c811f1 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
@@ -33,7 +33,6 @@ class AllofWithTheLastEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.NumberSchema
         all_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class AllofWithTheLastEmptySchema(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithTheLastEmptySchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi
index b15aca5ed89..e94b8c811f1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_the_last_empty_schema.pyi
@@ -33,7 +33,6 @@ class AllofWithTheLastEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.NumberSchema
         all_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class AllofWithTheLastEmptySchema(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithTheLastEmptySchema':
         return super().__new__(
             cls,
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 883d55ea5c1..e5ad4d3c7d7 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
@@ -33,7 +33,6 @@ class AllofWithTwoEmptySchemas(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.AnyTypeSchema
         all_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class AllofWithTwoEmptySchemas(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithTwoEmptySchemas':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi
index 883d55ea5c1..e5ad4d3c7d7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/allof_with_two_empty_schemas.pyi
@@ -33,7 +33,6 @@ class AllofWithTwoEmptySchemas(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         all_of_0 = schemas.AnyTypeSchema
         all_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class AllofWithTwoEmptySchemas(
                 cls.all_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AllofWithTwoEmptySchemas':
         return super().__new__(
             cls,
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 27b3ccaf5d3..ebd0656e4d8 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
@@ -33,7 +33,6 @@ class Anyof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         any_of_0 = schemas.IntSchema
         
         
@@ -43,24 +42,14 @@ class Anyof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 inclusive_minimum = 2
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_1':
                 return super().__new__(
                     cls,
@@ -85,21 +74,12 @@ class Anyof(
                 cls.any_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Anyof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi
index a7181022c4f..584f71bd5bf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof.pyi
@@ -33,7 +33,6 @@ class Anyof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         any_of_0 = schemas.IntSchema
         
         
@@ -43,23 +42,13 @@ class Anyof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_1':
                 return super().__new__(
                     cls,
@@ -84,21 +73,12 @@ class Anyof(
                 cls.any_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Anyof':
         return super().__new__(
             cls,
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 1163e5aa63a..5653f9c15c5 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
@@ -33,7 +33,6 @@ class AnyofComplexTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class any_of_0(
@@ -50,7 +49,6 @@ class AnyofComplexTypes(
                     __annotations__ = {
                         "bar": bar,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             bar: MetaOapg.properties.bar
@@ -59,23 +57,29 @@ class AnyofComplexTypes(
             def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 bar: typing.Union[MetaOapg.properties.bar, int, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -100,7 +104,6 @@ class AnyofComplexTypes(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -109,23 +112,29 @@ class AnyofComplexTypes(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_1':
                 return super().__new__(
                     cls,
@@ -151,21 +160,12 @@ class AnyofComplexTypes(
                 cls.any_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AnyofComplexTypes':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi
index 1163e5aa63a..5653f9c15c5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_complex_types.pyi
@@ -33,7 +33,6 @@ class AnyofComplexTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class any_of_0(
@@ -50,7 +49,6 @@ class AnyofComplexTypes(
                     __annotations__ = {
                         "bar": bar,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             bar: MetaOapg.properties.bar
@@ -59,23 +57,29 @@ class AnyofComplexTypes(
             def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 bar: typing.Union[MetaOapg.properties.bar, int, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -100,7 +104,6 @@ class AnyofComplexTypes(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -109,23 +112,29 @@ class AnyofComplexTypes(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_1':
                 return super().__new__(
                     cls,
@@ -151,21 +160,12 @@ class AnyofComplexTypes(
                 cls.any_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AnyofComplexTypes':
         return super().__new__(
             cls,
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 cb3c8080e90..d20a4d7124b 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
@@ -42,24 +42,14 @@ class AnyofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 max_length = 2
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -75,24 +65,14 @@ class AnyofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 min_length = 4
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_1':
                 return super().__new__(
                     cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi
index 34cd2e6f9e4..b156972e00c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_base_schema.pyi
@@ -42,23 +42,13 @@ class AnyofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -74,23 +64,13 @@ class AnyofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_1':
                 return super().__new__(
                     cls,
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 27c915975f5..2fd42e3c268 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
@@ -33,7 +33,6 @@ class AnyofWithOneEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         any_of_0 = schemas.NumberSchema
         any_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class AnyofWithOneEmptySchema(
                 cls.any_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AnyofWithOneEmptySchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi
index 27c915975f5..2fd42e3c268 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/anyof_with_one_empty_schema.pyi
@@ -33,7 +33,6 @@ class AnyofWithOneEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         any_of_0 = schemas.NumberSchema
         any_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class AnyofWithOneEmptySchema(
                 cls.any_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'AnyofWithOneEmptySchema':
         return super().__new__(
             cls,
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 a6bcf5e1b8a..47abae71ad3 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
@@ -33,24 +33,14 @@ class ByInt(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         multiple_of = 2
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ByInt':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi
index 5b101cdadd3..eef16f47cdd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_int.pyi
@@ -33,23 +33,13 @@ class ByInt(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ByInt':
         return super().__new__(
             cls,
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 cfef0eb21ca..5fec11f938c 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
@@ -33,24 +33,14 @@ class ByNumber(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         multiple_of = 1.5
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ByNumber':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi
index 291233c72f9..7608755e39a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_number.pyi
@@ -33,23 +33,13 @@ class ByNumber(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ByNumber':
         return super().__new__(
             cls,
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 5d732a200f8..503024cf9aa 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
@@ -33,24 +33,14 @@ class BySmallNumber(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         multiple_of = 0.00010
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'BySmallNumber':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi
index 1d6fa679573..ca698a9c764 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/by_small_number.pyi
@@ -33,23 +33,13 @@ class BySmallNumber(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'BySmallNumber':
         return super().__new__(
             cls,
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 255e31a59e0..9e499f6b3f5 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,28 +71,35 @@ class EnumsInProperties(
                 "bar": bar,
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
     
     bar: MetaOapg.properties.bar
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -100,7 +107,7 @@ class EnumsInProperties(
         bar: typing.Union[MetaOapg.properties.bar, str, ],
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EnumsInProperties':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi
index 255e31a59e0..9e499f6b3f5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/enums_in_properties.pyi
@@ -71,28 +71,35 @@ class EnumsInProperties(
                 "bar": bar,
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
     
     bar: MetaOapg.properties.bar
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", "foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -100,7 +107,7 @@ class EnumsInProperties(
         bar: typing.Union[MetaOapg.properties.bar, str, ],
         foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'EnumsInProperties':
         return super().__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 1ca64d68d86..b8d764fef05 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
@@ -34,68 +34,39 @@ class ForbiddenProperty(
 
     class MetaOapg:
         class properties:
-            
-            
-            class foo(
-                schemas.ComposedSchema,
-            ):
-            
-            
-                class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
-                    not_schema = schemas.AnyTypeSchema
-            
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                ) -> 'foo':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                        **kwargs,
-                    )
+            foo = schemas.NotAnyTypeSchema
             __annotations__ = {
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ForbiddenProperty':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi
index 1ca64d68d86..b8d764fef05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/forbidden_property.pyi
@@ -34,68 +34,39 @@ class ForbiddenProperty(
 
     class MetaOapg:
         class properties:
-            
-            
-            class foo(
-                schemas.ComposedSchema,
-            ):
-            
-            
-                class MetaOapg:
-                    additional_properties = schemas.AnyTypeSchema
-                    not_schema = schemas.AnyTypeSchema
-            
-                
-                def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                    # dict_instance[name] accessor
-                    if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                        return super().__getitem__(name)
-                    try:
-                        return super().__getitem__(name)
-                    except KeyError:
-                        return schemas.unset
-            
-                def __new__(
-                    cls,
-                    *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                    _configuration: typing.Optional[schemas.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
-                ) -> 'foo':
-                    return super().__new__(
-                        cls,
-                        *args,
-                        _configuration=_configuration,
-                        **kwargs,
-                    )
+            foo = schemas.NotAnyTypeSchema
             __annotations__ = {
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ForbiddenProperty':
         return super().__new__(
             cls,
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 507ad093945..26ffc93258d 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,32 +46,35 @@ class InvalidStringValueForDefault(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'InvalidStringValueForDefault':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi
index d92f7ad28c0..f2cdb82cdd9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/invalid_string_value_for_default.pyi
@@ -43,32 +43,35 @@ class InvalidStringValueForDefault(
             __annotations__ = {
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'InvalidStringValueForDefault':
         return super().__new__(
             cls,
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 251c8f2fe5c..a2db9ba8596 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
@@ -33,24 +33,14 @@ class MaximumValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         inclusive_maximum = 3.0
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaximumValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi
index 30a6bd1ccf6..3c2e26f04a5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation.pyi
@@ -33,23 +33,13 @@ class MaximumValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaximumValidation':
         return super().__new__(
             cls,
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 55edbda2965..2783ca4f8c9 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
@@ -33,24 +33,14 @@ class MaximumValidationWithUnsignedInteger(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         inclusive_maximum = 300
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaximumValidationWithUnsignedInteger':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi
index c4932d2d56c..7110772cd5c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maximum_validation_with_unsigned_integer.pyi
@@ -33,23 +33,13 @@ class MaximumValidationWithUnsignedInteger(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaximumValidationWithUnsignedInteger':
         return super().__new__(
             cls,
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 9793068884f..8e78128aedc 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
@@ -33,24 +33,14 @@ class MaxitemsValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         max_items = 2
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaxitemsValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi
index 1390ed061e5..d1807a1676d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxitems_validation.pyi
@@ -33,23 +33,13 @@ class MaxitemsValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaxitemsValidation':
         return super().__new__(
             cls,
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 133538a2de8..15ff375c553 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
@@ -33,24 +33,14 @@ class MaxlengthValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         max_length = 2
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaxlengthValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi
index 783b51cc987..2cd62139cfe 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxlength_validation.pyi
@@ -33,23 +33,13 @@ class MaxlengthValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaxlengthValidation':
         return super().__new__(
             cls,
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 2be76f98073..5bac7ebfda7 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
@@ -33,24 +33,14 @@ class Maxproperties0MeansTheObjectIsEmpty(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         max_properties = 0
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Maxproperties0MeansTheObjectIsEmpty':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi
index 7dd14c06b08..331c7590f92 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties0_means_the_object_is_empty.pyi
@@ -33,23 +33,13 @@ class Maxproperties0MeansTheObjectIsEmpty(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Maxproperties0MeansTheObjectIsEmpty':
         return super().__new__(
             cls,
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 04146b3513f..71db72519f6 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
@@ -33,24 +33,14 @@ class MaxpropertiesValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         max_properties = 2
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaxpropertiesValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi
index 8dd498f1dff..bec0f99907f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/maxproperties_validation.pyi
@@ -33,23 +33,13 @@ class MaxpropertiesValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MaxpropertiesValidation':
         return super().__new__(
             cls,
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 3c176d4dfcb..baf8f358f4a 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
@@ -33,24 +33,14 @@ class MinimumValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         inclusive_minimum = 1.1
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinimumValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi
index b1a5cfddb13..211d7420fc5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation.pyi
@@ -33,23 +33,13 @@ class MinimumValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinimumValidation':
         return super().__new__(
             cls,
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 717c79334dc..cceee42a831 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
@@ -33,24 +33,14 @@ class MinimumValidationWithSignedInteger(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         inclusive_minimum = -2
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinimumValidationWithSignedInteger':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi
index f892a533670..0859562602e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minimum_validation_with_signed_integer.pyi
@@ -33,23 +33,13 @@ class MinimumValidationWithSignedInteger(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinimumValidationWithSignedInteger':
         return super().__new__(
             cls,
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 09e8e79eacc..b97ce384e5b 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
@@ -33,24 +33,14 @@ class MinitemsValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         min_items = 1
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinitemsValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi
index 0880403a04c..cb6f33577e2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minitems_validation.pyi
@@ -33,23 +33,13 @@ class MinitemsValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinitemsValidation':
         return super().__new__(
             cls,
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 38fd50424ce..eb21f0c1669 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
@@ -33,24 +33,14 @@ class MinlengthValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         min_length = 2
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinlengthValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi
index d1ebd2745a9..0cfa276575a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minlength_validation.pyi
@@ -33,23 +33,13 @@ class MinlengthValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinlengthValidation':
         return super().__new__(
             cls,
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 706ad4266bd..9a6f12467d1 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
@@ -33,24 +33,14 @@ class MinpropertiesValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         min_properties = 1
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinpropertiesValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi
index b077c906203..f23c227bb05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/minproperties_validation.pyi
@@ -33,23 +33,13 @@ class MinpropertiesValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'MinpropertiesValidation':
         return super().__new__(
             cls,
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 7342cff4363..821bbd96a44 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
@@ -33,24 +33,14 @@ class ModelNot(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         not_schema = schemas.IntSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ModelNot':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi
index 7342cff4363..821bbd96a44 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/model_not.pyi
@@ -33,24 +33,14 @@ class ModelNot(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         not_schema = schemas.IntSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ModelNot':
         return super().__new__(
             cls,
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 fb4012d9347..f08f4c58b19 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
@@ -33,7 +33,6 @@ class NestedAllofToCheckValidationSemantics(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -42,7 +41,6 @@ class NestedAllofToCheckValidationSemantics(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 all_of_0 = schemas.NoneSchema
                 
                 @classmethod
@@ -60,21 +58,12 @@ class NestedAllofToCheckValidationSemantics(
                         cls.all_of_0,
                     ]
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -98,21 +87,12 @@ class NestedAllofToCheckValidationSemantics(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NestedAllofToCheckValidationSemantics':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi
index fb4012d9347..f08f4c58b19 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_allof_to_check_validation_semantics.pyi
@@ -33,7 +33,6 @@ class NestedAllofToCheckValidationSemantics(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class all_of_0(
@@ -42,7 +41,6 @@ class NestedAllofToCheckValidationSemantics(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 all_of_0 = schemas.NoneSchema
                 
                 @classmethod
@@ -60,21 +58,12 @@ class NestedAllofToCheckValidationSemantics(
                         cls.all_of_0,
                     ]
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'all_of_0':
                 return super().__new__(
                     cls,
@@ -98,21 +87,12 @@ class NestedAllofToCheckValidationSemantics(
                 cls.all_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NestedAllofToCheckValidationSemantics':
         return super().__new__(
             cls,
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 eef9537d546..dac0656c6ca 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
@@ -33,7 +33,6 @@ class NestedAnyofToCheckValidationSemantics(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class any_of_0(
@@ -42,7 +41,6 @@ class NestedAnyofToCheckValidationSemantics(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 any_of_0 = schemas.NoneSchema
                 
                 @classmethod
@@ -60,21 +58,12 @@ class NestedAnyofToCheckValidationSemantics(
                         cls.any_of_0,
                     ]
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -98,21 +87,12 @@ class NestedAnyofToCheckValidationSemantics(
                 cls.any_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NestedAnyofToCheckValidationSemantics':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi
index eef9537d546..dac0656c6ca 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_anyof_to_check_validation_semantics.pyi
@@ -33,7 +33,6 @@ class NestedAnyofToCheckValidationSemantics(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class any_of_0(
@@ -42,7 +41,6 @@ class NestedAnyofToCheckValidationSemantics(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 any_of_0 = schemas.NoneSchema
                 
                 @classmethod
@@ -60,21 +58,12 @@ class NestedAnyofToCheckValidationSemantics(
                         cls.any_of_0,
                     ]
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'any_of_0':
                 return super().__new__(
                     cls,
@@ -98,21 +87,12 @@ class NestedAnyofToCheckValidationSemantics(
                 cls.any_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NestedAnyofToCheckValidationSemantics':
         return super().__new__(
             cls,
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 a2682562f98..98c9e359224 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
@@ -33,7 +33,6 @@ class NestedOneofToCheckValidationSemantics(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class one_of_0(
@@ -42,7 +41,6 @@ class NestedOneofToCheckValidationSemantics(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 one_of_0 = schemas.NoneSchema
                 
                 @classmethod
@@ -60,21 +58,12 @@ class NestedOneofToCheckValidationSemantics(
                         cls.one_of_0,
                     ]
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -98,21 +87,12 @@ class NestedOneofToCheckValidationSemantics(
                 cls.one_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NestedOneofToCheckValidationSemantics':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi
index a2682562f98..98c9e359224 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/nested_oneof_to_check_validation_semantics.pyi
@@ -33,7 +33,6 @@ class NestedOneofToCheckValidationSemantics(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class one_of_0(
@@ -42,7 +41,6 @@ class NestedOneofToCheckValidationSemantics(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 one_of_0 = schemas.NoneSchema
                 
                 @classmethod
@@ -60,21 +58,12 @@ class NestedOneofToCheckValidationSemantics(
                         cls.one_of_0,
                     ]
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -98,21 +87,12 @@ class NestedOneofToCheckValidationSemantics(
                 cls.one_of_0,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NestedOneofToCheckValidationSemantics':
         return super().__new__(
             cls,
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 454cf81f1eb..e9719ead976 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
@@ -33,7 +33,6 @@ class NotMoreComplexSchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class not_schema(
@@ -47,31 +46,34 @@ class NotMoreComplexSchema(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
-            
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'not_schema':
                 return super().__new__(
                     cls,
@@ -81,21 +83,12 @@ class NotMoreComplexSchema(
                     **kwargs,
                 )
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NotMoreComplexSchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi
index 454cf81f1eb..e9719ead976 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/not_more_complex_schema.pyi
@@ -33,7 +33,6 @@ class NotMoreComplexSchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class not_schema(
@@ -47,31 +46,34 @@ class NotMoreComplexSchema(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
-            
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'not_schema':
                 return super().__new__(
                     cls,
@@ -81,21 +83,12 @@ class NotMoreComplexSchema(
                     **kwargs,
                 )
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'NotMoreComplexSchema':
         return super().__new__(
             cls,
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 95ea23f628b..1160cf42608 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
@@ -40,29 +40,34 @@ class ObjectPropertiesValidation(
                 "foo": foo,
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -70,7 +75,7 @@ class ObjectPropertiesValidation(
         foo: typing.Union[MetaOapg.properties.foo, int, schemas.Unset] = schemas.unset,
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectPropertiesValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi
index 95ea23f628b..1160cf42608 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/object_properties_validation.pyi
@@ -40,29 +40,34 @@ class ObjectPropertiesValidation(
                 "foo": foo,
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -70,7 +75,7 @@ class ObjectPropertiesValidation(
         foo: typing.Union[MetaOapg.properties.foo, int, schemas.Unset] = schemas.unset,
         bar: typing.Union[MetaOapg.properties.bar, str, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'ObjectPropertiesValidation':
         return super().__new__(
             cls,
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 7d3d8664cd5..b99c702776e 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
@@ -33,7 +33,6 @@ class Oneof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         one_of_0 = schemas.IntSchema
         
         
@@ -43,24 +42,14 @@ class Oneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 inclusive_minimum = 2
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
@@ -85,21 +74,12 @@ class Oneof(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Oneof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi
index 23aa7510d17..57112435659 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof.pyi
@@ -33,7 +33,6 @@ class Oneof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         one_of_0 = schemas.IntSchema
         
         
@@ -43,23 +42,13 @@ class Oneof(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
@@ -84,21 +73,12 @@ class Oneof(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'Oneof':
         return super().__new__(
             cls,
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 9b02bdd3c97..bdc06cc7dcb 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
@@ -33,7 +33,6 @@ class OneofComplexTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class one_of_0(
@@ -50,7 +49,6 @@ class OneofComplexTypes(
                     __annotations__ = {
                         "bar": bar,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             bar: MetaOapg.properties.bar
@@ -59,23 +57,29 @@ class OneofComplexTypes(
             def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 bar: typing.Union[MetaOapg.properties.bar, int, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -100,7 +104,6 @@ class OneofComplexTypes(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -109,23 +112,29 @@ class OneofComplexTypes(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
@@ -151,21 +160,12 @@ class OneofComplexTypes(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'OneofComplexTypes':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi
index 9b02bdd3c97..bdc06cc7dcb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_complex_types.pyi
@@ -33,7 +33,6 @@ class OneofComplexTypes(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class one_of_0(
@@ -50,7 +49,6 @@ class OneofComplexTypes(
                     __annotations__ = {
                         "bar": bar,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             bar: MetaOapg.properties.bar
@@ -59,23 +57,29 @@ class OneofComplexTypes(
             def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["bar", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["bar", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 bar: typing.Union[MetaOapg.properties.bar, int, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -100,7 +104,6 @@ class OneofComplexTypes(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
         
             
             foo: MetaOapg.properties.foo
@@ -109,23 +112,29 @@ class OneofComplexTypes(
             def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
@@ -151,21 +160,12 @@ class OneofComplexTypes(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'OneofComplexTypes':
         return super().__new__(
             cls,
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 b41b5d5e24a..9c2c121b9b5 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
@@ -42,24 +42,14 @@ class OneofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 min_length = 2
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -75,24 +65,14 @@ class OneofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
                 max_length = 4
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi
index bf0369f9d45..ebb53c6ab00 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_base_schema.pyi
@@ -42,23 +42,13 @@ class OneofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -74,23 +64,13 @@ class OneofWithBaseSchema(
         
         
             class MetaOapg:
-                additional_properties = schemas.AnyTypeSchema
         
-            
-            def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
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 218fd7f7b12..08980854fb6 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
@@ -33,7 +33,6 @@ class OneofWithEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         one_of_0 = schemas.NumberSchema
         one_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class OneofWithEmptySchema(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'OneofWithEmptySchema':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi
index 218fd7f7b12..08980854fb6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_empty_schema.pyi
@@ -33,7 +33,6 @@ class OneofWithEmptySchema(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         one_of_0 = schemas.NumberSchema
         one_of_1 = schemas.AnyTypeSchema
         
@@ -53,21 +52,12 @@ class OneofWithEmptySchema(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'OneofWithEmptySchema':
         return super().__new__(
             cls,
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 433b7ab6f7e..408e9a324b8 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
@@ -34,7 +34,6 @@ class OneofWithRequired(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class one_of_0(
@@ -47,35 +46,16 @@ class OneofWithRequired(
                     "bar",
                     "foo",
                 }
-                additional_properties = schemas.AnyTypeSchema
         
             
-            bar: MetaOapg.additional_properties
-            foo: MetaOapg.additional_properties
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["foo"], ]):
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+            bar: schemas.AnyTypeSchema
+            foo: schemas.AnyTypeSchema
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -95,35 +75,16 @@ class OneofWithRequired(
                     "foo",
                     "baz",
                 }
-                additional_properties = schemas.AnyTypeSchema
         
             
-            foo: MetaOapg.additional_properties
-            baz: MetaOapg.additional_properties
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["baz"], ]):
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+            foo: schemas.AnyTypeSchema
+            baz: schemas.AnyTypeSchema
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
@@ -148,21 +109,12 @@ class OneofWithRequired(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'OneofWithRequired':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi
index 433b7ab6f7e..408e9a324b8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/oneof_with_required.pyi
@@ -34,7 +34,6 @@ class OneofWithRequired(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class one_of_0(
@@ -47,35 +46,16 @@ class OneofWithRequired(
                     "bar",
                     "foo",
                 }
-                additional_properties = schemas.AnyTypeSchema
         
             
-            bar: MetaOapg.additional_properties
-            foo: MetaOapg.additional_properties
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["bar"], typing.Literal["foo"], ]):
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+            bar: schemas.AnyTypeSchema
+            foo: schemas.AnyTypeSchema
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_0':
                 return super().__new__(
                     cls,
@@ -95,35 +75,16 @@ class OneofWithRequired(
                     "foo",
                     "baz",
                 }
-                additional_properties = schemas.AnyTypeSchema
         
             
-            foo: MetaOapg.additional_properties
-            baz: MetaOapg.additional_properties
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: typing.Literal["baz"]) -> MetaOapg.additional_properties: ...
-            
-            @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-            
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["baz"], ]):
-                # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+            foo: schemas.AnyTypeSchema
+            baz: schemas.AnyTypeSchema
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'one_of_1':
                 return super().__new__(
                     cls,
@@ -148,21 +109,12 @@ class OneofWithRequired(
                 cls.one_of_1,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'OneofWithRequired':
         return super().__new__(
             cls,
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 220f7cb1070..513192c0011 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
@@ -33,26 +33,16 @@ class PatternIsNotAnchored(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         regex=[{
             'pattern': r'a+',  # noqa: E501
         }]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PatternIsNotAnchored':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi
index 1a0d65b042f..90a9607a78b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_is_not_anchored.pyi
@@ -33,23 +33,13 @@ class PatternIsNotAnchored(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PatternIsNotAnchored':
         return super().__new__(
             cls,
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 863c6d73315..f9a499c0e9f 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
@@ -33,26 +33,16 @@ class PatternValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         regex=[{
             'pattern': r'^a*$',  # noqa: E501
         }]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PatternValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi
index 618c8e5db34..5173d75376b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/pattern_validation.pyi
@@ -33,23 +33,13 @@ class PatternValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PatternValidation':
         return super().__new__(
             cls,
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 deccfde67ad..0b63e8b4244 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
@@ -48,45 +48,64 @@ class PropertiesWithEscapedCharacters(
                 "foo\tbar": foo_tbar,
                 "foo\fbar": foo_fbar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\nbar"]) -> MetaOapg.properties.foo_nbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\"bar"]) -> MetaOapg.properties.foo_bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\\bar"]) -> MetaOapg.properties.foo__bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\rbar"]) -> MetaOapg.properties.foo_rbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\tbar"]) -> MetaOapg.properties.foo_tbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\fbar"]) -> MetaOapg.properties.foo_fbar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\nbar"], typing.Literal["foo\"bar"], typing.Literal["foo\\bar"], typing.Literal["foo\rbar"], typing.Literal["foo\tbar"], typing.Literal["foo\fbar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PropertiesWithEscapedCharacters':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi
index deccfde67ad..0b63e8b4244 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/properties_with_escaped_characters.pyi
@@ -48,45 +48,64 @@ class PropertiesWithEscapedCharacters(
                 "foo\tbar": foo_tbar,
                 "foo\fbar": foo_fbar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\nbar"]) -> MetaOapg.properties.foo_nbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\"bar"]) -> MetaOapg.properties.foo_bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\\bar"]) -> MetaOapg.properties.foo__bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\rbar"]) -> MetaOapg.properties.foo_rbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\tbar"]) -> MetaOapg.properties.foo_tbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo\fbar"]) -> MetaOapg.properties.foo_fbar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\nbar"], typing.Literal["foo\"bar"], typing.Literal["foo\\bar"], typing.Literal["foo\rbar"], typing.Literal["foo\tbar"], typing.Literal["foo\fbar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\nbar"]) -> typing.Union[MetaOapg.properties.foo_nbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\"bar"]) -> typing.Union[MetaOapg.properties.foo_bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\\bar"]) -> typing.Union[MetaOapg.properties.foo__bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\rbar"]) -> typing.Union[MetaOapg.properties.foo_rbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\tbar"]) -> typing.Union[MetaOapg.properties.foo_tbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo\fbar"]) -> typing.Union[MetaOapg.properties.foo_fbar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo\nbar", "foo\"bar", "foo\\bar", "foo\rbar", "foo\tbar", "foo\fbar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PropertiesWithEscapedCharacters':
         return super().__new__(
             cls,
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 3a67e35f52d..40abe4bfebb 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
@@ -38,30 +38,34 @@ class PropertyNamedRefThatIsNotAReference(
             __annotations__ = {
                 "$ref": ref,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["$ref"]) -> MetaOapg.properties.ref: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["$ref"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["$ref", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["$ref", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PropertyNamedRefThatIsNotAReference':
         return super().__new__(
             cls,
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.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi
index 3a67e35f52d..40abe4bfebb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/property_named_ref_that_is_not_a_reference.pyi
@@ -38,30 +38,34 @@ class PropertyNamedRefThatIsNotAReference(
             __annotations__ = {
                 "$ref": ref,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["$ref"]) -> MetaOapg.properties.ref: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["$ref"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["$ref", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["$ref"]) -> typing.Union[MetaOapg.properties.ref, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["$ref", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'PropertyNamedRefThatIsNotAReference':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py
index 60e1cb8ea97..c21cd611da5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.py
@@ -41,12 +41,10 @@ class RefInAdditionalproperties(
     
     def __getitem__(self, name: typing.Union[str, ]) -> 'PropertyNamedRefThatIsNotAReference':
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> 'PropertyNamedRefThatIsNotAReference':
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi
index 60e1cb8ea97..c21cd611da5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_additionalproperties.pyi
@@ -41,12 +41,10 @@ class RefInAdditionalproperties(
     
     def __getitem__(self, name: typing.Union[str, ]) -> 'PropertyNamedRefThatIsNotAReference':
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    def get_item_oapg(self, name: typing.Union[str, ]) -> 'PropertyNamedRefThatIsNotAReference':
+        return super().get_item_oapg(name)
 
     def __new__(
         cls,
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 5be21c9ef0a..374bfb43856 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
@@ -33,7 +33,6 @@ class RefInAllof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
@@ -50,21 +49,12 @@ class RefInAllof(
                 PropertyNamedRefThatIsNotAReference,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInAllof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi
index 5be21c9ef0a..374bfb43856 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_allof.pyi
@@ -33,7 +33,6 @@ class RefInAllof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
@@ -50,21 +49,12 @@ class RefInAllof(
                 PropertyNamedRefThatIsNotAReference,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInAllof':
         return super().__new__(
             cls,
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 522b9eeaddd..3057da6bec3 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
@@ -33,7 +33,6 @@ class RefInAnyof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
@@ -50,21 +49,12 @@ class RefInAnyof(
                 PropertyNamedRefThatIsNotAReference,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInAnyof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi
index 522b9eeaddd..3057da6bec3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_anyof.pyi
@@ -33,7 +33,6 @@ class RefInAnyof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
@@ -50,21 +49,12 @@ class RefInAnyof(
                 PropertyNamedRefThatIsNotAReference,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInAnyof':
         return super().__new__(
             cls,
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 cfde1a9d7da..06fe55a7762 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
@@ -33,28 +33,18 @@ class RefInNot(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
         def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInNot':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi
index cfde1a9d7da..06fe55a7762 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_not.pyi
@@ -33,28 +33,18 @@ class RefInNot(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
         def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInNot':
         return super().__new__(
             cls,
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 6bd2b68b327..183fb1ce93c 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
@@ -33,7 +33,6 @@ class RefInOneof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
@@ -50,21 +49,12 @@ class RefInOneof(
                 PropertyNamedRefThatIsNotAReference,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInOneof':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi
index 6bd2b68b327..183fb1ce93c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_oneof.pyi
@@ -33,7 +33,6 @@ class RefInOneof(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
@@ -50,21 +49,12 @@ class RefInOneof(
                 PropertyNamedRefThatIsNotAReference,
             ]
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInOneof':
         return super().__new__(
             cls,
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 0b71287ad2a..403e6dea3f9 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,32 +42,35 @@ class RefInProperty(
             __annotations__ = {
                 "a": a,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    a: typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["a"]) -> 'PropertyNamedRefThatIsNotAReference': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["a"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         a: typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInProperty':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi
index 0b71287ad2a..403e6dea3f9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/ref_in_property.pyi
@@ -42,32 +42,35 @@ class RefInProperty(
             __annotations__ = {
                 "a": a,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    a: typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["a"]) -> 'PropertyNamedRefThatIsNotAReference': ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["a"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["a", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["a"]) -> typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["a", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         a: typing.Union['PropertyNamedRefThatIsNotAReference', schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RefInProperty':
         return super().__new__(
             cls,
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 3c6b2b69e79..e31d2303684 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,32 +38,35 @@ class RequiredDefaultValidation(
             __annotations__ = {
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredDefaultValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi
index 3c6b2b69e79..e31d2303684 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_default_validation.pyi
@@ -38,32 +38,35 @@ class RequiredDefaultValidation(
             __annotations__ = {
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredDefaultValidation':
         return super().__new__(
             cls,
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 10ecf311976..bce6b82e7bf 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
@@ -43,29 +43,36 @@ class RequiredValidation(
                 "foo": foo,
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
     foo: MetaOapg.properties.foo
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -73,7 +80,7 @@ class RequiredValidation(
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi
index 10ecf311976..bce6b82e7bf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_validation.pyi
@@ -43,29 +43,36 @@ class RequiredValidation(
                 "foo": foo,
                 "bar": bar,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
     foo: MetaOapg.properties.foo
-    bar: typing.Union[MetaOapg.properties.bar, schemas.Unset]
     
     @typing.overload
     def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], typing.Literal["bar"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["bar"]) -> typing.Union[MetaOapg.properties.bar, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", "bar", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
@@ -73,7 +80,7 @@ class RequiredValidation(
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         bar: typing.Union[MetaOapg.properties.bar, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredValidation':
         return super().__new__(
             cls,
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 a375e4ae812..c610df1e696 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,32 +38,35 @@ class RequiredWithEmptyArray(
             __annotations__ = {
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredWithEmptyArray':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi
index a375e4ae812..c610df1e696 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_empty_array.pyi
@@ -38,32 +38,35 @@ class RequiredWithEmptyArray(
             __annotations__ = {
                 "foo": foo,
             }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
-    
     @typing.overload
-    def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         foo: typing.Union[MetaOapg.properties.foo, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredWithEmptyArray':
         return super().__new__(
             cls,
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 2cda6a537fe..4b046ef92a3 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
@@ -41,45 +41,14 @@ class RequiredWithEscapedCharacters(
             "foo\rbar",
             "foo\\bar",
         }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\"bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\nbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\fbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\tbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\rbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\\bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\\\"bar"], typing.Literal["foo\\nbar"], typing.Literal["foo\\fbar"], typing.Literal["foo\\tbar"], typing.Literal["foo\\rbar"], typing.Literal["foo\\\\bar"], ]):
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredWithEscapedCharacters':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi
index 2cda6a537fe..4b046ef92a3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/required_with_escaped_characters.pyi
@@ -41,45 +41,14 @@ class RequiredWithEscapedCharacters(
             "foo\rbar",
             "foo\\bar",
         }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\"bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\nbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\fbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\tbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\rbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\\bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\\\"bar"], typing.Literal["foo\\nbar"], typing.Literal["foo\\fbar"], typing.Literal["foo\\tbar"], typing.Literal["foo\\rbar"], typing.Literal["foo\\\\bar"], ]):
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'RequiredWithEscapedCharacters':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
index 8d5132b5c09..25f71b3abb7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
@@ -46,31 +46,34 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
             __annotations__ = {
                 "alpha": alpha,
             }
-        additional_properties = schemas.AnyTypeSchema
-    
-    alpha: typing.Union[MetaOapg.properties.alpha, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["alpha"]) -> MetaOapg.properties.alpha: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["alpha"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["alpha", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["alpha", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         alpha: typing.Union[MetaOapg.properties.alpha, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
index 3b3368ef221..8a13722987f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
@@ -43,31 +43,34 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
             __annotations__ = {
                 "alpha": alpha,
             }
-        additional_properties = schemas.AnyTypeSchema
-    
-    alpha: typing.Union[MetaOapg.properties.alpha, schemas.Unset]
     
     @typing.overload
-    def __getitem__(self, name: typing.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
+    def __getitem__(self, name: typing.Literal["alpha"]) -> MetaOapg.properties.alpha: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+    def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
     
-    def __getitem__(self, name: typing.Union[str, typing.Literal["alpha"], ]):
+    def __getitem__(self, name: typing.Union[typing.Literal["alpha", ], str]):
         # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+        return super().__getitem__(name)
+    
+    
+    @typing.overload
+    def get_item_oapg(self, name: typing.Literal["alpha"]) -> typing.Union[MetaOapg.properties.alpha, schemas.Unset]: ...
+    
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+    
+    def get_item_oapg(self, name: typing.Union[typing.Literal["alpha", ], str]):
+        return super().get_item_oapg(name)
+    
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, ],
         alpha: typing.Union[MetaOapg.properties.alpha, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing':
         return super().__new__(
             cls,
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 bf76a4d2c55..c20b05ebbe0 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
@@ -33,24 +33,14 @@ class UniqueitemsFalseValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         unique_items = False
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'UniqueitemsFalseValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi
index 86f69d137ff..b2f34e4153a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_false_validation.pyi
@@ -33,23 +33,13 @@ class UniqueitemsFalseValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'UniqueitemsFalseValidation':
         return super().__new__(
             cls,
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 93644ef0e5d..ffc6e8f29ad 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
@@ -33,24 +33,14 @@ class UniqueitemsValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         unique_items = True
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'UniqueitemsValidation':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi
index 6490ef033fa..0e734902d9d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/model/uniqueitems_validation.pyi
@@ -33,23 +33,13 @@ class UniqueitemsValidation(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
-
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
+
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'UniqueitemsValidation':
         return super().__new__(
             cls,
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 a474ea6761d..3db71a544e7 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
@@ -34,7 +34,6 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class not_schema(
@@ -48,31 +47,34 @@ class SchemaForRequestBodyApplicationJson(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
-            
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'not_schema':
                 return super().__new__(
                     cls,
@@ -82,21 +84,12 @@ class SchemaForRequestBodyApplicationJson(
                     **kwargs,
                 )
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi 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.pyi
index 4a5ba5c4805..6ca3cec11e9 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.pyi
+++ 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.pyi
@@ -32,7 +32,6 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class not_schema(
@@ -46,31 +45,34 @@ class SchemaForRequestBodyApplicationJson(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
-            
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'not_schema':
                 return super().__new__(
                     cls,
@@ -80,21 +82,12 @@ class SchemaForRequestBodyApplicationJson(
                     **kwargs,
                 )
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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 df31fbc5f0e..eb4ece7090f 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
@@ -34,24 +34,14 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         not_schema = schemas.IntSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi
index 0fb9dedc85a..de03da59cc4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_not_request_body/post.pyi
@@ -32,24 +32,14 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         not_schema = schemas.IntSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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 268bc3c8761..aca5ccd7f46 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
@@ -36,28 +36,18 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
         def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.pyi
index e031a6db017..a2dcb0022e0 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.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/unit_test_api/paths/request_body_post_ref_in_not_request_body/post.pyi
@@ -34,28 +34,18 @@ class SchemaForRequestBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
         def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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 ceb6d0512ef..4a1d16aaaf5 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
@@ -42,45 +42,14 @@ class SchemaForRequestBodyApplicationJson(
             "foo\rbar",
             "foo\\bar",
         }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\"bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\nbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\fbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\tbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\rbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\\bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\\\"bar"], typing.Literal["foo\\nbar"], typing.Literal["foo\\fbar"], typing.Literal["foo\\tbar"], typing.Literal["foo\\rbar"], typing.Literal["foo\\\\bar"], ]):
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi 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.pyi
index 9bc56a3e4f8..5f95a6724ca 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.pyi
+++ 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.pyi
@@ -40,45 +40,14 @@ class SchemaForRequestBodyApplicationJson(
             "foo\rbar",
             "foo\\bar",
         }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\"bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\nbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\fbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\tbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\rbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\\bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\\\"bar"], typing.Literal["foo\\nbar"], typing.Literal["foo\\fbar"], typing.Literal["foo\\tbar"], typing.Literal["foo\\rbar"], typing.Literal["foo\\\\bar"], ]):
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaForRequestBodyApplicationJson':
         return super().__new__(
             cls,
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 c63a09de280..f834c1eb670 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
@@ -33,7 +33,6 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class not_schema(
@@ -47,31 +46,34 @@ class SchemaFor200ResponseBodyApplicationJson(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
-            
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'not_schema':
                 return super().__new__(
                     cls,
@@ -81,21 +83,12 @@ class SchemaFor200ResponseBodyApplicationJson(
                     **kwargs,
                 )
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi 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.pyi
index 9418f7c21f4..e6f4173e855 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.pyi
+++ 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.pyi
@@ -31,7 +31,6 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         
         class not_schema(
@@ -45,31 +44,34 @@ class SchemaFor200ResponseBodyApplicationJson(
                     __annotations__ = {
                         "foo": foo,
                     }
-                additional_properties = schemas.AnyTypeSchema
-            
-            foo: typing.Union[MetaOapg.properties.foo, schemas.Unset]
             
             @typing.overload
-            def __getitem__(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            def __getitem__(self, name: typing.Literal["foo"]) -> MetaOapg.properties.foo: ...
             
             @typing.overload
-            def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
+            def __getitem__(self, name: str) -> typing.Union[schemas.AnyTypeSchema]: ...
             
-            def __getitem__(self, name: typing.Union[str, typing.Literal["foo"], ]):
+            def __getitem__(self, name: typing.Union[typing.Literal["foo", ], str]):
                 # dict_instance[name] accessor
-                if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-                    return super().__getitem__(name)
-                try:
-                    return super().__getitem__(name)
-                except KeyError:
-                    return schemas.unset
+                return super().__getitem__(name)
+            
+            
+            @typing.overload
+            def get_item_oapg(self, name: typing.Literal["foo"]) -> typing.Union[MetaOapg.properties.foo, schemas.Unset]: ...
+            
+            @typing.overload
+            def get_item_oapg(self, name: str) -> typing.Union[schemas.AnyTypeSchema, schemas.Unset]: ...
+            
+            def get_item_oapg(self, name: typing.Union[typing.Literal["foo", ], str]):
+                return super().get_item_oapg(name)
+            
         
             def __new__(
                 cls,
                 *args: typing.Union[dict, frozendict.frozendict, ],
                 foo: typing.Union[MetaOapg.properties.foo, str, schemas.Unset] = schemas.unset,
                 _configuration: typing.Optional[schemas.Configuration] = None,
-                **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+                **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
             ) -> 'not_schema':
                 return super().__new__(
                     cls,
@@ -79,21 +81,12 @@ class SchemaFor200ResponseBodyApplicationJson(
                     **kwargs,
                 )
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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 dc96c32ecc0..d66b0781b3a 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
@@ -33,24 +33,14 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         not_schema = schemas.IntSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi 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.pyi
index ee38f4be569..65d857b20f0 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.pyi
+++ 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.pyi
@@ -31,24 +31,14 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         not_schema = schemas.IntSchema
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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 138a238101a..b44518b1c1c 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
@@ -35,28 +35,18 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
         def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi 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.pyi
index 4bfb08d2b63..e1b7119413f 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.pyi
+++ 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.pyi
@@ -33,28 +33,18 @@ class SchemaFor200ResponseBodyApplicationJson(
 
 
     class MetaOapg:
-        additional_properties = schemas.AnyTypeSchema
         
         @classmethod
         @property
         def not_schema(cls) -> typing.Type['PropertyNamedRefThatIsNotAReference']:
             return PropertyNamedRefThatIsNotAReference
 
-    
-    def __getitem__(self, name: typing.Union[str, ]) -> MetaOapg.additional_properties:
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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 d6a083d5104..3bd92778a42 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
@@ -41,45 +41,14 @@ class SchemaFor200ResponseBodyApplicationJson(
             "foo\rbar",
             "foo\\bar",
         }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\"bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\nbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\fbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\tbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\rbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\\bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\\\"bar"], typing.Literal["foo\\nbar"], typing.Literal["foo\\fbar"], typing.Literal["foo\\tbar"], typing.Literal["foo\\rbar"], typing.Literal["foo\\\\bar"], ]):
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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.pyi 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.pyi
index ce5c3b5a1ac..7619488ece7 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.pyi
+++ 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.pyi
@@ -39,45 +39,14 @@ class SchemaFor200ResponseBodyApplicationJson(
             "foo\rbar",
             "foo\\bar",
         }
-        additional_properties = schemas.AnyTypeSchema
 
     
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\"bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\nbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\fbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\tbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\rbar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: typing.Literal["foo\\\\bar"]) -> MetaOapg.additional_properties: ...
-    
-    @typing.overload
-    def __getitem__(self, name: str) -> typing.Union[MetaOapg.additional_properties, schemas.Unset]: ...
-    
-    def __getitem__(self, name: typing.Union[str, typing.Literal["foo\\\"bar"], typing.Literal["foo\\nbar"], typing.Literal["foo\\fbar"], typing.Literal["foo\\tbar"], typing.Literal["foo\\rbar"], typing.Literal["foo\\\\bar"], ]):
-        # dict_instance[name] accessor
-        if not hasattr(self.MetaOapg, 'properties') or name not in self.MetaOapg.properties.__annotations__:
-            return super().__getitem__(name)
-        try:
-            return super().__getitem__(name)
-        except KeyError:
-            return schemas.unset
 
     def __new__(
         cls,
         *args: typing.Union[dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
         _configuration: typing.Optional[schemas.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.additional_properties, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes, ],
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
     ) -> 'SchemaFor200ResponseBodyApplicationJson':
         return super().__new__(
             cls,
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 f28e5f9a252..37b0cc73846 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
@@ -1571,14 +1571,38 @@ class DictBase(Discriminable, ValidatorBase):
             raise AttributeError('property setting not supported on immutable instances')
 
     def __getattr__(self, name: str):
-        # for instance.name access
-        if isinstance(self, frozendict.frozendict):
-            # if an attribute does not exist
-            try:
-                return self[name]
-            except KeyError as ex:
-                raise AttributeError(str(ex))
-        return super().__getattr__(self, name)
+        """
+        for instance.name access
+        Properties are only type hinted for required properties
+        so that hasattr(instance, 'optionalProp') is False when that key is not present
+        """
+        if not isinstance(self, frozendict.frozendict):
+            return super().__getattr__(name)
+        if name not in self.__class__.__annotations__:
+            raise AttributeError(f"{self} has no attribute '{name}'")
+        try:
+            value = self[name]
+            return value
+        except KeyError as ex:
+            raise AttributeError(str(ex))
+
+    def __getitem__(self, name: str):
+        """
+        dict_instance[name] accessor
+        key errors thrown
+        """
+        if not isinstance(self, frozendict.frozendict):
+            return super().__getattr__(name)
+        return super().__getitem__(name)
+
+    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+        # dict_instance[name] accessor
+        if not isinstance(self, frozendict.frozendict):
+            raise NotImplementedError()
+        try:
+            return super().__getitem__(name)
+        except KeyError:
+            return unset
 
 
 def cast_to_allowed_types(
@@ -1843,7 +1867,8 @@ class ComposedSchema(
     StrBase,
     BoolBase,
     NoneBase,
-    Schema
+    Schema,
+    NoneFrozenDictTupleStrDecimalBoolMixin
 ):
     @classmethod
     def from_openapi_data_oapg(cls, *args: typing.Any, _configuration: typing.Optional[Configuration] = None, **kwargs):
@@ -2151,6 +2176,29 @@ class AnyTypeSchema(
     pass
 
 
+class NotAnyTypeSchema(
+    ComposedSchema,
+):
+    """
+    Does not allow inputs in of AnyType
+    Note: validations on this class are never run because the code knows that no inputs will ever validate
+    """
+
+    class MetaOapg:
+        not_schema = AnyTypeSchema
+
+    def __new__(
+        cls,
+        *args,
+        _configuration: typing.Optional[Configuration] = None,
+    ) -> 'NotAnyTypeSchema':
+        return super().__new__(
+            cls,
+            *args,
+            _configuration=_configuration,
+        )
+
+
 class DictSchema(
     SchemaTypeCheckerClsFactory(typing.Union[frozendict.frozendict]),
     DictBase,
-- 
GitLab


From 3045677d7991ddc7315dac1bf5598e57ff693b0c Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 10:28:12 -0700
Subject: [PATCH 29/30] Migration guide updated

---
 .../python-experimental/README.handlebars         | 15 ++++++++++-----
 .../3_0_3_unit_test/python-experimental/README.md | 15 ++++++++++-----
 .../client/petstore/python-experimental/README.md | 15 ++++++++++-----
 .../model/additional_properties_class.py          |  1 -
 .../model/additional_properties_class.pyi         |  1 -
 .../petstore_api/model/api_response.py            |  1 -
 .../petstore_api/model/api_response.pyi           |  1 -
 .../model/array_of_array_of_number_only.py        |  1 -
 .../model/array_of_array_of_number_only.pyi       |  1 -
 .../petstore_api/model/array_of_number_only.py    |  1 -
 .../petstore_api/model/array_of_number_only.pyi   |  1 -
 .../petstore_api/model/array_test.py              |  1 -
 .../petstore_api/model/array_test.pyi             |  1 -
 .../petstore_api/model/capitalization.py          |  1 -
 .../petstore_api/model/capitalization.pyi         |  1 -
 .../python-experimental/petstore_api/model/cat.py |  1 -
 .../petstore_api/model/cat.pyi                    |  1 -
 .../petstore_api/model/child_cat.py               |  1 -
 .../petstore_api/model/child_cat.pyi              |  1 -
 .../petstore_api/model/class_model.py             |  1 -
 .../petstore_api/model/class_model.pyi            |  1 -
 .../petstore_api/model/client.py                  |  1 -
 .../petstore_api/model/client.pyi                 |  1 -
 .../petstore_api/model/complex_quadrilateral.py   |  1 -
 .../petstore_api/model/complex_quadrilateral.pyi  |  1 -
 .../python-experimental/petstore_api/model/dog.py |  1 -
 .../petstore_api/model/dog.pyi                    |  1 -
 .../petstore_api/model/drawing.py                 |  1 -
 .../petstore_api/model/drawing.pyi                |  1 -
 .../petstore_api/model/enum_arrays.py             |  1 -
 .../petstore_api/model/enum_arrays.pyi            |  1 -
 .../petstore_api/model/equilateral_triangle.py    |  1 -
 .../petstore_api/model/equilateral_triangle.pyi   |  1 -
 .../petstore_api/model/file.py                    |  1 -
 .../petstore_api/model/file.pyi                   |  1 -
 .../petstore_api/model/file_schema_test_class.py  |  1 -
 .../petstore_api/model/file_schema_test_class.pyi |  1 -
 .../python-experimental/petstore_api/model/foo.py |  1 -
 .../petstore_api/model/foo.pyi                    |  1 -
 .../petstore_api/model/fruit.py                   |  1 -
 .../petstore_api/model/fruit.pyi                  |  1 -
 .../petstore_api/model/gm_fruit.py                |  1 -
 .../petstore_api/model/gm_fruit.pyi               |  1 -
 .../petstore_api/model/has_only_read_only.py      |  1 -
 .../petstore_api/model/has_only_read_only.pyi     |  1 -
 .../petstore_api/model/health_check_result.py     |  1 -
 .../petstore_api/model/health_check_result.pyi    |  1 -
 .../petstore_api/model/isosceles_triangle.py      |  1 -
 .../petstore_api/model/isosceles_triangle.pyi     |  1 -
 .../petstore_api/model/map_test.py                |  1 -
 .../petstore_api/model/map_test.pyi               |  1 -
 ..._properties_and_additional_properties_class.py |  1 -
 ...properties_and_additional_properties_class.pyi |  1 -
 .../petstore_api/model/model200_response.py       |  1 -
 .../petstore_api/model/model200_response.pyi      |  1 -
 .../petstore_api/model/model_return.py            |  1 -
 .../petstore_api/model/model_return.pyi           |  1 -
 .../petstore_api/model/nullable_class.py          |  1 -
 .../petstore_api/model/nullable_class.pyi         |  1 -
 .../petstore_api/model/number_only.py             |  1 -
 .../petstore_api/model/number_only.pyi            |  1 -
 .../model/object_model_with_ref_props.py          |  1 -
 .../model/object_model_with_ref_props.pyi         |  1 -
 .../model/object_with_decimal_properties.py       |  1 -
 .../model/object_with_decimal_properties.pyi      |  1 -
 .../object_with_inline_composition_property.py    |  1 -
 .../object_with_inline_composition_property.pyi   |  1 -
 .../petstore_api/model/order.py                   |  1 -
 .../petstore_api/model/order.pyi                  |  1 -
 .../petstore_api/model/player.py                  |  1 -
 .../petstore_api/model/player.pyi                 |  1 -
 .../petstore_api/model/read_only_first.py         |  1 -
 .../petstore_api/model/read_only_first.pyi        |  1 -
 .../petstore_api/model/scalene_triangle.py        |  1 -
 .../petstore_api/model/scalene_triangle.pyi       |  1 -
 .../petstore_api/model/simple_quadrilateral.py    |  1 -
 .../petstore_api/model/simple_quadrilateral.pyi   |  1 -
 .../petstore_api/model/special_model_name.py      |  1 -
 .../petstore_api/model/special_model_name.pyi     |  1 -
 .../python-experimental/petstore_api/model/tag.py |  1 -
 .../petstore_api/model/tag.pyi                    |  1 -
 .../petstore_api/model/user.py                    |  1 -
 .../petstore_api/model/user.pyi                   |  1 -
 .../petstore_api/paths/fake_2/get.py              |  1 -
 .../petstore_api/paths/fake_2/get.pyi             |  1 -
 .../paths/fake_inline_composition_/post.py        |  3 ---
 .../paths/fake_inline_composition_/post.pyi       |  3 ---
 .../petstore_api/paths/fake_obj_in_query/get.py   |  1 -
 .../petstore_api/paths/fake_obj_in_query/get.pyi  |  1 -
 .../petstore_api/paths/fake_upload_files/post.py  |  1 -
 .../petstore_api/paths/fake_upload_files/post.pyi |  1 -
 .../petstore_api/paths/foo/get.py                 |  1 -
 .../petstore_api/paths/foo/get.pyi                |  1 -
 .../petstore_api/paths/pet_pet_id_3/post.py       |  1 -
 .../petstore_api/paths/pet_pet_id_3/post.pyi      |  1 -
 .../paths/pet_pet_id_upload_image/post.py         |  1 -
 .../paths/pet_pet_id_upload_image/post.pyi        |  1 -
 97 files changed, 30 insertions(+), 113 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars b/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
index 6f79a861aa9..a14d519a6bb 100644
--- a/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
+++ b/modules/openapi-generator/src/main/resources/python-experimental/README.handlebars
@@ -50,11 +50,16 @@ object schema properties as classes
     keyword in one schema, and include a format constraint in another schema
     - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
     - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. If object(dict) properties are accessed and they do not exist then schemas.unset will be returned
-    - When accessed with model_instance.someProp or model_instance["someProp"] and someProp is not in the payload,
-    then schemas.unset will be returned.
-    - This was done so type hints for optional properties could show that schemas.Unset is a valid value.
-    - So you will need to update code to schema.unset values because KeyErrors will not be thrown
+7. Property access on AnyType(type unset) or object(dict) schemas
+    - Only required keys with valid python names are properties like .someProp and have type hints
+    - All optional keys may not exist, so properties are not defined for them
+    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
+    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+        - All required and optional keys have type hints for this method, and @typing.overload is used
+        - A type hint is also generated for additionalProperties accessed using this method
+    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
+    and additionalProperty values
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md b/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
index 69f27fe79b1..101866d02ee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/README.md
@@ -42,11 +42,16 @@ object schema properties as classes
     keyword in one schema, and include a format constraint in another schema
     - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
     - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. If object(dict) properties are accessed and they do not exist then schemas.unset will be returned
-    - When accessed with model_instance.someProp or model_instance["someProp"] and someProp is not in the payload,
-    then schemas.unset will be returned.
-    - This was done so type hints for optional properties could show that schemas.Unset is a valid value.
-    - So you will need to update code to schema.unset values because KeyErrors will not be thrown
+7. Property access on AnyType(type unset) or object(dict) schemas
+    - Only required keys with valid python names are properties like .someProp and have type hints
+    - All optional keys may not exist, so properties are not defined for them
+    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
+    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+        - All required and optional keys have type hints for this method, and @typing.overload is used
+        - A type hint is also generated for additionalProperties accessed using this method
+    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
+    and additionalProperty values
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/petstore/python-experimental/README.md b/samples/openapi3/client/petstore/python-experimental/README.md
index 0b511c6c926..211b5548f45 100644
--- a/samples/openapi3/client/petstore/python-experimental/README.md
+++ b/samples/openapi3/client/petstore/python-experimental/README.md
@@ -42,11 +42,16 @@ object schema properties as classes
     keyword in one schema, and include a format constraint in another schema
     - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
     - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
-7. If object(dict) properties are accessed and they do not exist then schemas.unset will be returned
-    - When accessed with model_instance.someProp or model_instance["someProp"] and someProp is not in the payload,
-    then schemas.unset will be returned.
-    - This was done so type hints for optional properties could show that schemas.Unset is a valid value.
-    - So you will need to update code to schema.unset values because KeyErrors will not be thrown
+7. Property access on AnyType(type unset) or object(dict) schemas
+    - Only required keys with valid python names are properties like .someProp and have type hints
+    - All optional keys may not exist, so properties are not defined for them
+    - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
+    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+        - All required and optional keys have type hints for this method, and @typing.overload is used
+        - A type hint is also generated for additionalProperties accessed using this method
+    - So you will need to update you code to use some_instance['optionalProp'] to access optional property
+    and additionalProperty values
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
index a598b707fd8..51bbde25a2d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py
@@ -212,7 +212,6 @@ class AdditionalPropertiesClass(
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
index a598b707fd8..51bbde25a2d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.pyi
@@ -212,7 +212,6 @@ class AdditionalPropertiesClass(
                 "map_with_undeclared_properties_string": map_with_undeclared_properties_string,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_property"]) -> MetaOapg.properties.map_property: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
index 89c6db20e05..85b0f620e58 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py
@@ -43,7 +43,6 @@ class ApiResponse(
                 "message": message,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["code"]) -> MetaOapg.properties.code: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
index 89c6db20e05..85b0f620e58 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.pyi
@@ -43,7 +43,6 @@ class ApiResponse(
                 "message": message,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["code"]) -> MetaOapg.properties.code: ...
     
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 e58148d2c65..ccd543c2a41 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
@@ -83,7 +83,6 @@ class ArrayOfArrayOfNumberOnly(
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
index e58148d2c65..ccd543c2a41 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.pyi
@@ -83,7 +83,6 @@ class ArrayOfArrayOfNumberOnly(
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayArrayNumber"]) -> MetaOapg.properties.ArrayArrayNumber: ...
     
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 7d37cf39a39..d8e12b5ef54 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
@@ -61,7 +61,6 @@ class ArrayOfNumberOnly(
                 "ArrayNumber": ArrayNumber,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["ArrayNumber"]) -> MetaOapg.properties.ArrayNumber: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
index 7d37cf39a39..d8e12b5ef54 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.pyi
@@ -61,7 +61,6 @@ class ArrayOfNumberOnly(
                 "ArrayNumber": ArrayNumber,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["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 9b59a1ed8ac..bc202e022fe 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
@@ -157,7 +157,6 @@ class ArrayTest(
                 "array_array_of_model": array_array_of_model,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
index 9b59a1ed8ac..bc202e022fe 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.pyi
@@ -157,7 +157,6 @@ class ArrayTest(
                 "array_array_of_model": array_array_of_model,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["array_of_string"]) -> MetaOapg.properties.array_of_string: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
index ada8c015951..a8f93a7ff16 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py
@@ -49,7 +49,6 @@ class Capitalization(
                 "ATT_NAME": ATT_NAME,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
index ada8c015951..a8f93a7ff16 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.pyi
@@ -49,7 +49,6 @@ class Capitalization(
                 "ATT_NAME": ATT_NAME,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["smallCamel"]) -> MetaOapg.properties.smallCamel: ...
     
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 dcfaed1e359..44d9f021625 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
@@ -47,7 +47,6 @@ class Cat(
                         "declawed": declawed,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
index dcfaed1e359..44d9f021625 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.pyi
@@ -47,7 +47,6 @@ class Cat(
                         "declawed": declawed,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["declawed"]) -> MetaOapg.properties.declawed: ...
             
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 055e3ccd010..46adae2d78e 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
@@ -47,7 +47,6 @@ class ChildCat(
                         "name": name,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
index 055e3ccd010..46adae2d78e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.pyi
@@ -47,7 +47,6 @@ class ChildCat(
                         "name": name,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
             
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 d5a0789ca33..6d0384e5429 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
@@ -42,7 +42,6 @@ class ClassModel(
             }
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["_class"]) -> MetaOapg.properties._class: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
index d5a0789ca33..6d0384e5429 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.pyi
@@ -42,7 +42,6 @@ class ClassModel(
             }
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["_class"]) -> MetaOapg.properties._class: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
index fcadba541d0..42395f2d66f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py
@@ -39,7 +39,6 @@ class Client(
                 "client": client,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["client"]) -> MetaOapg.properties.client: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
index fcadba541d0..42395f2d66f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.pyi
@@ -39,7 +39,6 @@ class Client(
                 "client": client,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["client"]) -> MetaOapg.properties.client: ...
     
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 15537e23a5d..3e281e1a107 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
@@ -61,7 +61,6 @@ class ComplexQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
index 15537e23a5d..3e281e1a107 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.pyi
@@ -61,7 +61,6 @@ class ComplexQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
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 cb51e24be1c..67eb76fe19c 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
@@ -47,7 +47,6 @@ class Dog(
                         "breed": breed,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["breed"]) -> MetaOapg.properties.breed: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
index cb51e24be1c..67eb76fe19c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.pyi
@@ -47,7 +47,6 @@ class Dog(
                         "breed": breed,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["breed"]) -> MetaOapg.properties.breed: ...
             
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 37723450eb1..4d1fb9da907 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
@@ -88,7 +88,6 @@ class Drawing(
         def additional_properties(cls) -> typing.Type['Fruit']:
             return Fruit
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["mainShape"]) -> 'Shape': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
index 37723450eb1..4d1fb9da907 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/drawing.pyi
@@ -88,7 +88,6 @@ class Drawing(
         def additional_properties(cls) -> typing.Type['Fruit']:
             return Fruit
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["mainShape"]) -> 'Shape': ...
     
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 187722f2c7a..8eecc929b8f 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
@@ -103,7 +103,6 @@ class EnumArrays(
                 "array_enum": array_enum,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
index 187722f2c7a..8eecc929b8f 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.pyi
@@ -103,7 +103,6 @@ class EnumArrays(
                 "array_enum": array_enum,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["just_symbol"]) -> MetaOapg.properties.just_symbol: ...
     
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 4f7e13b4907..af41cd6cb78 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
@@ -61,7 +61,6 @@ class EquilateralTriangle(
                         "triangleType": triangleType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
index 4f7e13b4907..af41cd6cb78 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.pyi
@@ -61,7 +61,6 @@ class EquilateralTriangle(
                         "triangleType": triangleType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
index 6e31b4cf812..59eb2b98dd4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py
@@ -41,7 +41,6 @@ class File(
                 "sourceURI": sourceURI,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
index 6e31b4cf812..59eb2b98dd4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.pyi
@@ -41,7 +41,6 @@ class File(
                 "sourceURI": sourceURI,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["sourceURI"]) -> MetaOapg.properties.sourceURI: ...
     
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 83895979a71..fbde1e71393 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
@@ -71,7 +71,6 @@ class FileSchemaTestClass(
                 "files": files,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> 'File': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
index 83895979a71..fbde1e71393 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.pyi
@@ -71,7 +71,6 @@ class FileSchemaTestClass(
                 "files": files,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["file"]) -> 'File': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
index 11c888cda77..2c66b2be12e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py
@@ -39,7 +39,6 @@ class Foo(
                 "bar": bar,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
index 11c888cda77..2c66b2be12e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.pyi
@@ -39,7 +39,6 @@ class Foo(
                 "bar": bar,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
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 8e013ddfe11..2d22f2e1e37 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
@@ -56,7 +56,6 @@ class Fruit(
             ]
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
index 8e013ddfe11..2d22f2e1e37 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.pyi
@@ -56,7 +56,6 @@ class Fruit(
             ]
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
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 becd6db7a96..aeb09bb7c6d 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
@@ -56,7 +56,6 @@ class GmFruit(
             ]
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
index becd6db7a96..aeb09bb7c6d 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.pyi
@@ -56,7 +56,6 @@ class GmFruit(
             ]
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["color"]) -> MetaOapg.properties.color: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
index f1c5d6fe385..c985a50955b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py
@@ -41,7 +41,6 @@ class HasOnlyReadOnly(
                 "foo": foo,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
index f1c5d6fe385..c985a50955b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.pyi
@@ -41,7 +41,6 @@ class HasOnlyReadOnly(
                 "foo": foo,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
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 9f8efa019e6..ec9de5d056a 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
@@ -61,7 +61,6 @@ class HealthCheckResult(
                 "NullableMessage": NullableMessage,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
index 9f8efa019e6..ec9de5d056a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.pyi
@@ -61,7 +61,6 @@ class HealthCheckResult(
                 "NullableMessage": NullableMessage,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["NullableMessage"]) -> MetaOapg.properties.NullableMessage: ...
     
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 0e93639c95f..b4abcb991b2 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
@@ -61,7 +61,6 @@ class IsoscelesTriangle(
                         "triangleType": triangleType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
index 0e93639c95f..b4abcb991b2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.pyi
@@ -61,7 +61,6 @@ class IsoscelesTriangle(
                         "triangleType": triangleType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
index fd72b091f0a..655b9701bdf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py
@@ -181,7 +181,6 @@ class MapTest(
                 "indirect_map": indirect_map,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
index fd72b091f0a..655b9701bdf 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.pyi
@@ -181,7 +181,6 @@ class MapTest(
                 "indirect_map": indirect_map,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["map_map_of_string"]) -> MetaOapg.properties.map_map_of_string: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
index c5300cc0ec2..478cd0bcd04 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py
@@ -75,7 +75,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "map": map,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
index c5300cc0ec2..478cd0bcd04 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.pyi
@@ -75,7 +75,6 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                 "map": map,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["uuid"]) -> MetaOapg.properties.uuid: ...
     
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 d201b3b87b9..9f6c5a4cdd4 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
@@ -44,7 +44,6 @@ class Model200Response(
             }
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
index d201b3b87b9..9f6c5a4cdd4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.pyi
@@ -44,7 +44,6 @@ class Model200Response(
             }
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["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 12442ba49f2..9901db357df 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
@@ -42,7 +42,6 @@ class ModelReturn(
             }
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["return"]) -> MetaOapg.properties._return: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
index 12442ba49f2..9901db357df 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.pyi
@@ -42,7 +42,6 @@ class ModelReturn(
             }
 
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["return"]) -> MetaOapg.properties._return: ...
     
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 bc6de349b25..c75e01e59f5 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
@@ -456,7 +456,6 @@ class NullableClass(
                     **kwargs,
                 )
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
index bc6de349b25..c75e01e59f5 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/nullable_class.pyi
@@ -456,7 +456,6 @@ class NullableClass(
                     **kwargs,
                 )
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["integer_prop"]) -> MetaOapg.properties.integer_prop: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
index 6cb40db86c8..107f6b67778 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py
@@ -39,7 +39,6 @@ class NumberOnly(
                 "JustNumber": JustNumber,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
index 6cb40db86c8..107f6b67778 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.pyi
@@ -39,7 +39,6 @@ class NumberOnly(
                 "JustNumber": JustNumber,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["JustNumber"]) -> MetaOapg.properties.JustNumber: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
index 53499f7ca02..9d07bc256ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py
@@ -49,7 +49,6 @@ class ObjectModelWithRefProps(
                 "myBoolean": myBoolean,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["myNumber"]) -> 'NumberWithValidations': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
index 53499f7ca02..9d07bc256ae 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.pyi
@@ -49,7 +49,6 @@ class ObjectModelWithRefProps(
                 "myBoolean": myBoolean,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["myNumber"]) -> 'NumberWithValidations': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
index 559a9082ac4..e1708ce7b22 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py
@@ -47,7 +47,6 @@ class ObjectWithDecimalProperties(
                 "cost": cost,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["length"]) -> MetaOapg.properties.length: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
index 559a9082ac4..e1708ce7b22 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.pyi
@@ -47,7 +47,6 @@ class ObjectWithDecimalProperties(
                 "cost": cost,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["length"]) -> MetaOapg.properties.length: ...
     
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 0fda845866d..ffea07c9458 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
@@ -84,7 +84,6 @@ class ObjectWithInlineCompositionProperty(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
index 0140709810a..dba9801a69b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.pyi
@@ -81,7 +81,6 @@ class ObjectWithInlineCompositionProperty(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
index 733177b3930..3fccf083695 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py
@@ -75,7 +75,6 @@ class Order(
                 "complete": complete,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
index 733177b3930..3fccf083695 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.pyi
@@ -75,7 +75,6 @@ class Order(
                 "complete": complete,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
index f5d402d0d65..5b150ce4411 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py
@@ -47,7 +47,6 @@ class Player(
                 "enemyPlayer": enemyPlayer,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
index f5d402d0d65..5b150ce4411 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.pyi
@@ -47,7 +47,6 @@ class Player(
                 "enemyPlayer": enemyPlayer,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
index b588fa0cfbf..1ed2b953a1e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py
@@ -41,7 +41,6 @@ class ReadOnlyFirst(
                 "baz": baz,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
index b588fa0cfbf..1ed2b953a1e 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.pyi
@@ -41,7 +41,6 @@ class ReadOnlyFirst(
                 "baz": baz,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["bar"]) -> MetaOapg.properties.bar: ...
     
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 fd873ceae33..53c5cf53067 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
@@ -61,7 +61,6 @@ class ScaleneTriangle(
                         "triangleType": triangleType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
index fd873ceae33..53c5cf53067 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.pyi
@@ -61,7 +61,6 @@ class ScaleneTriangle(
                         "triangleType": triangleType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["triangleType"]) -> MetaOapg.properties.triangleType: ...
             
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 b804656b591..a4c3cc76414 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
@@ -61,7 +61,6 @@ class SimpleQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
index b804656b591..a4c3cc76414 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.pyi
@@ -61,7 +61,6 @@ class SimpleQuadrilateral(
                         "quadrilateralType": quadrilateralType,
                     }
             
-            
             @typing.overload
             def __getitem__(self, name: typing.Literal["quadrilateralType"]) -> MetaOapg.properties.quadrilateralType: ...
             
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
index 3d25ed32596..2a8e33f3418 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py
@@ -41,7 +41,6 @@ class SpecialModelName(
                 "a": a,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["a"]) -> MetaOapg.properties.a: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
index 3d25ed32596..2a8e33f3418 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.pyi
@@ -41,7 +41,6 @@ class SpecialModelName(
                 "a": a,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["a"]) -> MetaOapg.properties.a: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
index b676eda9bbf..1798c640652 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py
@@ -41,7 +41,6 @@ class Tag(
                 "name": name,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
index b676eda9bbf..1798c640652 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.pyi
@@ -41,7 +41,6 @@ class Tag(
                 "name": name,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
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 a737521628f..425fa0f8f57 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
@@ -107,7 +107,6 @@ class User(
                 "anyTypePropNullable": anyTypePropNullable,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
index a737521628f..425fa0f8f57 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.pyi
@@ -107,7 +107,6 @@ class User(
                 "anyTypePropNullable": anyTypePropNullable,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["id"]) -> MetaOapg.properties.id: ...
     
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 48f748298a4..6d3e4b7775f 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
@@ -368,7 +368,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string": enum_form_string,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
index 6c324afc1a1..fa178dcfcca 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_2/get.pyi
@@ -292,7 +292,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "enum_form_string": enum_form_string,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["enum_form_string_array"]) -> MetaOapg.properties.enum_form_string_array: ...
     
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 bffc3bf8303..8b43524248f 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
@@ -131,7 +131,6 @@ class CompositionInPropertySchema(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
@@ -304,7 +303,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
@@ -455,7 +453,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
index 3b1585e9be8..2f3e3e847fa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_inline_composition_/post.pyi
@@ -123,7 +123,6 @@ class CompositionInPropertySchema(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
@@ -259,7 +258,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
@@ -394,7 +392,6 @@ class SchemaFor200ResponseBodyMultipartFormData(
                 "someProp": someProp,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["someProp"]) -> MetaOapg.properties.someProp: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
index 9a6b21202c5..cbbb77e84b1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.py
@@ -39,7 +39,6 @@ class MapBeanSchema(
                 "keyword": keyword,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
index d879e557de1..682ea08e912 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_obj_in_query/get.pyi
@@ -37,7 +37,6 @@ class MapBeanSchema(
                 "keyword": keyword,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["keyword"]) -> MetaOapg.properties.keyword: ...
     
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 ba7a764800b..42a9272a157 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
@@ -64,7 +64,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "files": files,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
index 50a99f79da7..436cac9a4aa 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/fake_upload_files/post.pyi
@@ -62,7 +62,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "files": files,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["files"]) -> MetaOapg.properties.files: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
index 1890f090a86..18a21f5f8a9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.py
@@ -45,7 +45,6 @@ class SchemaFor0ResponseBodyApplicationJson(
                 "string": string,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["string"]) -> 'Foo': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
index 67faf18db5c..b82d3298fb4 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/foo/get.pyi
@@ -43,7 +43,6 @@ class SchemaFor0ResponseBodyApplicationJson(
                 "string": string,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["string"]) -> 'Foo': ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
index 7206838b29a..8ff78f9a525 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.py
@@ -68,7 +68,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "status": status,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
index fc89ca3aa27..2ed0715cd9a 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_3/post.pyi
@@ -42,7 +42,6 @@ class SchemaForRequestBodyApplicationXWwwFormUrlencoded(
                 "status": status,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["name"]) -> MetaOapg.properties.name: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
index 7311adffdc1..1d2038d750c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.py
@@ -70,7 +70,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "file": file,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
index 65108fac2a4..866edc81a12 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/paths/pet_pet_id_upload_image/post.pyi
@@ -44,7 +44,6 @@ class SchemaForRequestBodyMultipartFormData(
                 "file": file,
             }
     
-    
     @typing.overload
     def __getitem__(self, name: typing.Literal["additionalMetadata"]) -> MetaOapg.properties.additionalMetadata: ...
     
-- 
GitLab


From e1e2e407435a7e4cb4507cf640f9464aa5d1c0e2 Mon Sep 17 00:00:00 2001
From: Justin Black <justin.a.black@gmail.com>
Date: Sun, 4 Sep 2022 11:13:21 -0700
Subject: [PATCH 30/30] Samples regenerated

---
 .../openapitools/codegen/DefaultCodegen.java  | 34 ++++++++++++++++++-
 .../PythonExperimentalClientCodegen.java      | 23 +++----------
 .../.openapi-generator/VERSION                |  2 +-
 .../.openapi-generator/VERSION                |  2 +-
 .../handler/PathHandlerInterface.java         |  4 +--
 5 files changed, 41 insertions(+), 24 deletions(-)

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 4bef2d1136b..e49231b10f4 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
@@ -3615,7 +3615,9 @@ 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
+     * @param schemaIsFromAdditionalProperties true if the property is a required property defined by additional properties schema
+     *                                         If this is the actual additionalProperties schema not defining a required property, then
+     *                                         the value should be false
      * @return Codegen Property object
      */
     public CodegenProperty fromProperty(String name, Schema p, boolean required, boolean schemaIsFromAdditionalProperties) {
@@ -7864,4 +7866,34 @@ public class DefaultCodegen implements CodegenConfig {
     Into strings that can be rendered in the language that the generator will output to
     */
     protected String handleSpecialCharacters(String name) { return name; }
+
+    /**
+     * Used to ensure that null or Schema is returned given an input Boolean/Schema/null
+     * This will be used in openapi 3.1.0 spec processing to ensure that Booleans become Schemas
+     * Because our generators only understand Schemas
+     * Note: use getIsBooleanSchemaTrue or getIsBooleanSchemaFalse on the IJsonSchemaValidationProperties
+     * if you need to be able to detect if the original schema's value was true or false
+     *
+     * @param schema the input Boolean or Schema data to convert to a Schema
+     * @return Schema the input data converted to a Schema if possible
+     */
+    protected Schema getSchemaFromBooleanOrSchema(Object schema) {
+        if (schema instanceof Boolean) {
+            if (Boolean.TRUE.equals(schema)) {
+                return trueSchema;
+            } else if (Boolean.FALSE.equals(schema)) {
+                return falseSchema;
+            }
+            // null case
+            return null;
+        } else if (schema instanceof Schema) {
+            if (schema == null) {
+                return null;
+            }
+            return (Schema) schema;
+        } else if (schema == null) {
+            return null;
+        }
+        throw new IllegalArgumentException("Invalid schema type; type must be Boolean or Schema");
+    }
 }
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 396867560d8..c2f27e6c1fe 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
@@ -2239,27 +2239,12 @@ public class PythonExperimentalClientCodegen extends AbstractPythonCodegen {
      */
     @Override
     protected void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
-        if (schema.getAdditionalProperties() == null) {
+        Schema addPropsSchema = getSchemaFromBooleanOrSchema(schema.getAdditionalProperties());
+        if (addPropsSchema == null) {
             return;
         }
-        CodegenProperty addPropProp;
-        if (schema.getAdditionalProperties() instanceof Boolean) {
-            if (Boolean.TRUE.equals(schema.getAdditionalProperties())) {
-                addPropProp = fromProperty("",  trueSchema);
-                addPropProp.nameInSnakeCase = null;
-                property.setAdditionalProperties(addPropProp);
-            } else if (Boolean.FALSE.equals(schema.getAdditionalProperties())) {
-                // false is equivalent to not AnyType
-                addPropProp = fromProperty("",  falseSchema);
-                addPropProp.nameInSnakeCase = null;
-                property.setAdditionalProperties(addPropProp);
-            }
-        } else {
-            Schema addPropsSchema = (Schema) schema.getAdditionalProperties();
-            addPropProp = fromProperty("", addPropsSchema);
-            addPropProp.nameInSnakeCase = null;
-            property.setAdditionalProperties(addPropProp);
-        }
+        CodegenProperty addPropProp = fromProperty("",  addPropsSchema, false, false);
+        property.setAdditionalProperties(addPropProp);
     }
 
     /**
diff --git a/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION
index 717311e32e3..66672d4e9d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION
+++ b/samples/openapi3/client/3_0_3_unit_test/python-experimental/.openapi-generator/VERSION
@@ -1 +1 @@
-unset
\ No newline at end of file
+6.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
index 717311e32e3..66672d4e9d3 100644
--- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION
@@ -1 +1 @@
-unset
\ No newline at end of file
+6.1.0-SNAPSHOT
\ No newline at end of file
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 784226b9f6f..8235fae6b0f 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 {
      * <p><b>Response headers</b>: [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, 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='{
+}', 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, isBooleanSchemaTrue=false, isBooleanSchemaFalse=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, schemaIsFromAdditionalProperties=false}]</p>
+}', 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, isBooleanSchemaTrue=false, isBooleanSchemaFalse=false}]</p>
      *
      * <p><b>Produces</b>: [{mediaType=application/xml}, {mediaType=application/json}]</p>
      * <p><b>Returns</b>: {@link String}</p>
-- 
GitLab